From: Javier M. Mellid Date: Thu, 26 Apr 2012 18:45:55 +0000 (+0200) Subject: staging: sm7xx: rename function X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=acbaa0bf052a363de640725972563a34d61cfb82;p=deliverable%2Flinux.git staging: sm7xx: rename function This patch changes the name of function cfb_blank to smtc_blank. This function is not implemented like a generic function for frame buffer. Having the old prefix becomes confused when reading fb_ops structs. Tested with SM712 Signed-off-by: Javier M. Mellid Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index 83756a89b66f..746c4cd5d30e 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c @@ -266,7 +266,7 @@ static inline unsigned int chan_to_field(unsigned int chan, return chan << bf->offset; } -static int cfb_blank(int blank_mode, struct fb_info *info) +static int smtc_blank(int blank_mode, struct fb_info *info) { /* clear DPMS setting */ switch (blank_mode) { @@ -653,7 +653,7 @@ static struct fb_ops smtcfb_ops = { .fb_check_var = smtc_check_var, .fb_set_par = smtc_set_par, .fb_setcolreg = smtc_setcolreg, - .fb_blank = cfb_blank, + .fb_blank = smtc_blank, .fb_fillrect = cfb_fillrect, .fb_imageblit = cfb_imageblit, .fb_copyarea = cfb_copyarea,