lkml.org 
[lkml]   [2010]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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>
    ---
    drivers/video/backlight/adx_bl.c | 2 +-
    drivers/video/backlight/backlight.c | 2 +-
    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 d769b0b..a683dd1 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)
    return brightness & 0xff;
    }

    -static int adx_backlight_check_fb(struct fb_info *fb)
    +static int adx_backlight_check_fb(struct backlight_device *bldev, struct fb_info *fb)
    {
    return 1;
    }
    diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
    index 18829cf..b800cd4 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,
    mutex_lock(&bd->ops_lock);
    if (bd->ops)
    if (!bd->ops->check_fb ||
    - bd->ops->check_fb(evdata->info)) {
    + bd->ops->check_fb(bd, evdata->info)) {
    bd->props.fb_blank = *(int *)evdata->data;
    if (bd->props.fb_blank == FB_BLANK_UNBLANK)
    bd->props.state &= ~BL_CORE_FBBLANK;
    diff --git a/include/linux/backlight.h b/include/linux/backlight.h
    index 8c4f884..15413ce 100644
    --- a/include/linux/backlight.h
    +++ b/include/linux/backlight.h
    @@ -47,7 +47,7 @@ struct backlight_ops {
    int (* const get_brightness)(struct backlight_device *);
    /* Check if given framebuffer device is the one bound to this backlight;
    return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
    - int (* const check_fb)(struct fb_info *);
    + int (* const check_fb)(struct backlight_device *, struct fb_info *);
    };

    /* This structure defines all the properties of a backlight */
    --
    1.6.4.4
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-02-26 13:25    [W:0.024 / U:29.120 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site