Commit 51d53e5b authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Lee Jones
Browse files

backlight: Use backlight_get_brightness() throughout 



Introduce the backlight_get_brightness() helper in all
video/backlight/* drivers. This simplifies the code and align the
implementation of the update_status() operation across the different
backlight drivers.

Some of the drivers gains a little extra functionality by the change
as they now respect the fb_blank() ioctl.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent a00a5feb

drivers/video/backlight/88pm860x_bl.c

+1 −12
Original line number Diff line number Diff line
@@ -121,18 +121,7 @@ out: 


static int pm860x_backlight_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.fb_blank != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.state & BL_CORE_SUSPENDED)

		brightness = 0;



	return pm860x_backlight_set(bl, brightness);

	return pm860x_backlight_set(bl, backlight_get_brightness(bl));

}



static int pm860x_backlight_get_brightness(struct backlight_device *bl)

drivers/video/backlight/adp5520_bl.c

+1 −9
Original line number Diff line number Diff line
@@ -65,15 +65,7 @@ static int adp5520_bl_set(struct backlight_device *bl, int brightness) 


static int adp5520_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.fb_blank != FB_BLANK_UNBLANK)

		brightness = 0;



	return adp5520_bl_set(bl, brightness);

	return adp5520_bl_set(bl, backlight_get_brightness(bl));

}



static int adp5520_bl_get_brightness(struct backlight_device *bl)

drivers/video/backlight/adp8860_bl.c

+1 −9
Original line number Diff line number Diff line
@@ -361,15 +361,7 @@ static int adp8860_bl_set(struct backlight_device *bl, int brightness) 


static int adp8860_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.fb_blank != FB_BLANK_UNBLANK)

		brightness = 0;



	return adp8860_bl_set(bl, brightness);

	return adp8860_bl_set(bl, backlight_get_brightness(bl));

}



static int adp8860_bl_get_brightness(struct backlight_device *bl)

drivers/video/backlight/adp8870_bl.c

+1 −9
Original line number Diff line number Diff line
@@ -399,15 +399,7 @@ static int adp8870_bl_set(struct backlight_device *bl, int brightness) 


static int adp8870_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.fb_blank != FB_BLANK_UNBLANK)

		brightness = 0;



	return adp8870_bl_set(bl, brightness);

	return adp8870_bl_set(bl, backlight_get_brightness(bl));

}



static int adp8870_bl_get_brightness(struct backlight_device *bl)

drivers/video/backlight/bd6107.c

+1 −6
Original line number Diff line number Diff line
@@ -82,12 +82,7 @@ static int bd6107_write(struct bd6107 *bd, u8 reg, u8 data) 
static int bd6107_backlight_update_status(struct backlight_device *backlight)

{

	struct bd6107 *bd = bl_get_data(backlight);

	int brightness = backlight->props.brightness;



	if (backlight->props.power != FB_BLANK_UNBLANK ||

	    backlight->props.fb_blank != FB_BLANK_UNBLANK ||

	    backlight->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))

		brightness = 0;

	int brightness = backlight_get_brightness(backlight);



	if (brightness) {

		bd6107_write(bd, BD6107_PORTSEL, BD6107_PORTSEL_LEDM(2) |

CRA Git | Maintained and supported by SUSTech CRA and CCSE