diff options
| author | Bruno Prémont <bonbons@linux-vserver.org> | 2010-02-20 18:20:01 -0500 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-16 15:47:54 -0400 |
| commit | 57e148b6a975980944f4466ccb669b1d02dfc6a1 (patch) | |
| tree | dcd32f5fda62e57d5ea0eef5dcad0f1c81c90f4b | |
| parent | a4ebb780e194e8751dc22deeabcddd3fdc8f18f0 (diff) | |
backlight: Add backlight_device parameter to check_fb
check_fb from backlight_ops lacks a reference to the backlight_device
that's being referred to. Add this parameter so a backlight_device
can be mapped to a single framebuffer, especially if the same driver
handles multiple devices on a single system.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | drivers/video/backlight/adx_bl.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/backlight.c | 2 | ||||
| -rw-r--r-- | include/linux/backlight.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c index d769b0bab21a..a683dd1be4bc 100644 --- a/drivers/video/backlight/adx_bl.c +++ b/drivers/video/backlight/adx_bl.c | |||
| @@ -56,7 +56,7 @@ static int adx_backlight_get_brightness(struct backlight_device *bldev) | |||
| 56 | return brightness & 0xff; | 56 | return brightness & 0xff; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | static int adx_backlight_check_fb(struct fb_info *fb) | 59 | static int adx_backlight_check_fb(struct backlight_device *bldev, struct fb_info *fb) |
| 60 | { | 60 | { |
| 61 | return 1; | 61 | return 1; |
| 62 | } | 62 | } |
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 18829cf68b1b..b800cd4eeec8 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c | |||
| @@ -38,7 +38,7 @@ static int fb_notifier_callback(struct notifier_block *self, | |||
| 38 | mutex_lock(&bd->ops_lock); | 38 | mutex_lock(&bd->ops_lock); |
| 39 | if (bd->ops) | 39 | if (bd->ops) |
| 40 | if (!bd->ops->check_fb || | 40 | if (!bd->ops->check_fb || |
| 41 | bd->ops->check_fb(evdata->info)) { | 41 | bd->ops->check_fb(bd, evdata->info)) { |
| 42 | bd->props.fb_blank = *(int *)evdata->data; | 42 | bd->props.fb_blank = *(int *)evdata->data; |
| 43 | if (bd->props.fb_blank == FB_BLANK_UNBLANK) | 43 | if (bd->props.fb_blank == FB_BLANK_UNBLANK) |
| 44 | bd->props.state &= ~BL_CORE_FBBLANK; | 44 | bd->props.state &= ~BL_CORE_FBBLANK; |
diff --git a/include/linux/backlight.h b/include/linux/backlight.h index ee377d791996..21cd866d24cd 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h | |||
| @@ -47,7 +47,7 @@ struct backlight_ops { | |||
| 47 | int (*get_brightness)(struct backlight_device *); | 47 | int (*get_brightness)(struct backlight_device *); |
| 48 | /* Check if given framebuffer device is the one bound to this backlight; | 48 | /* Check if given framebuffer device is the one bound to this backlight; |
| 49 | return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */ | 49 | return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */ |
| 50 | int (*check_fb)(struct fb_info *); | 50 | int (*check_fb)(struct backlight_device *, struct fb_info *); |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | /* This structure defines all the properties of a backlight */ | 53 | /* This structure defines all the properties of a backlight */ |