From: Ben Dooks Add the lcd_device being checked to the check_fb entry of lcd_ops. This ensures that any driver using this to check against it's own state can do so, and also makes all the calls in lcd_ops more orthogonal in their arguments. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton --- drivers/video/backlight/lcd.c | 2 +- drivers/video/bf54x-lq043fb.c | 2 +- drivers/video/bfin-t350mcqb-fb.c | 2 +- include/linux/lcd.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/video/backlight/lcd.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops drivers/video/backlight/lcd.c --- a/drivers/video/backlight/lcd.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops +++ a/drivers/video/backlight/lcd.c @@ -33,7 +33,7 @@ static int fb_notifier_callback(struct n ld = container_of(self, struct lcd_device, fb_notif); mutex_lock(&ld->ops_lock); if (ld->ops) - if (!ld->ops->check_fb || ld->ops->check_fb(evdata->info)) + if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) ld->ops->set_power(ld, *(int *)evdata->data); mutex_unlock(&ld->ops_lock); return 0; diff -puN drivers/video/bf54x-lq043fb.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops drivers/video/bf54x-lq043fb.c --- a/drivers/video/bf54x-lq043fb.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops +++ a/drivers/video/bf54x-lq043fb.c @@ -478,7 +478,7 @@ static int bfin_lcd_set_contrast(struct return 0; } -static int bfin_lcd_check_fb(struct fb_info *fi) +static int bfin_lcd_check_fb(struct lcd_device *dev, struct fb_info *fi) { if (!fi || (fi == &bfin_bf54x_fb)) return 1; diff -puN drivers/video/bfin-t350mcqb-fb.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops drivers/video/bfin-t350mcqb-fb.c --- a/drivers/video/bfin-t350mcqb-fb.c~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops +++ a/drivers/video/bfin-t350mcqb-fb.c @@ -396,7 +396,7 @@ static int bfin_lcd_set_contrast(struct return 0; } -static int bfin_lcd_check_fb(struct fb_info *fi) +static int bfin_lcd_check_fb(struct lcd_device *dev, struct fb_info *fi) { if (!fi || (fi == &bfin_t350mcqb_fb)) return 1; diff -puN include/linux/lcd.h~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops include/linux/lcd.h --- a/include/linux/lcd.h~lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops +++ a/include/linux/lcd.h @@ -47,7 +47,7 @@ struct lcd_ops { int (*set_contrast)(struct lcd_device *, int contrast); /* Check if given framebuffer device is the one LCD is bound to; return 0 if not, !=0 if it is. If NULL, lcd always matches the fb. */ - int (*check_fb)(struct fb_info *); + int (*check_fb)(struct lcd_device *, struct fb_info *); }; struct lcd_device { _