Skip to content

Commit 51d53e5

Browse files
sravnborgLee Jones
sravnborg
authored and
Lee Jones
committed
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: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
1 parent a00a5fe commit 51d53e5

19 files changed

Lines changed: 19 additions & 150 deletions

‎drivers/video/backlight/88pm860x_bl.c‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,7 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
121121

122122
static int pm860x_backlight_update_status(struct backlight_device *bl)
123123
{
124-
int brightness = bl->props.brightness;
125-
126-
if (bl->props.power != FB_BLANK_UNBLANK)
127-
brightness = 0;
128-
129-
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
130-
brightness = 0;
131-
132-
if (bl->props.state & BL_CORE_SUSPENDED)
133-
brightness = 0;
134-
135-
return pm860x_backlight_set(bl, brightness);
124+
return pm860x_backlight_set(bl, backlight_get_brightness(bl));
136125
}
137126

138127
static int pm860x_backlight_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/adp5520_bl.c‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,7 @@ static int adp5520_bl_set(struct backlight_device *bl, int brightness)
6565

6666
static int adp5520_bl_update_status(struct backlight_device *bl)
6767
{
68-
int brightness = bl->props.brightness;
69-
70-
if (bl->props.power != FB_BLANK_UNBLANK)
71-
brightness = 0;
72-
73-
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
74-
brightness = 0;
75-
76-
return adp5520_bl_set(bl, brightness);
68+
return adp5520_bl_set(bl, backlight_get_brightness(bl));
7769
}
7870

7971
static int adp5520_bl_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/adp8860_bl.c‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,7 @@ static int adp8860_bl_set(struct backlight_device *bl, int brightness)
361361

362362
static int adp8860_bl_update_status(struct backlight_device *bl)
363363
{
364-
int brightness = bl->props.brightness;
365-
366-
if (bl->props.power != FB_BLANK_UNBLANK)
367-
brightness = 0;
368-
369-
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
370-
brightness = 0;
371-
372-
return adp8860_bl_set(bl, brightness);
364+
return adp8860_bl_set(bl, backlight_get_brightness(bl));
373365
}
374366

375367
static int adp8860_bl_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/adp8870_bl.c‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -399,15 +399,7 @@ static int adp8870_bl_set(struct backlight_device *bl, int brightness)
399399

400400
static int adp8870_bl_update_status(struct backlight_device *bl)
401401
{
402-
int brightness = bl->props.brightness;
403-
404-
if (bl->props.power != FB_BLANK_UNBLANK)
405-
brightness = 0;
406-
407-
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
408-
brightness = 0;
409-
410-
return adp8870_bl_set(bl, brightness);
402+
return adp8870_bl_set(bl, backlight_get_brightness(bl));
411403
}
412404

413405
static int adp8870_bl_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/bd6107.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,7 @@ static int bd6107_write(struct bd6107 *bd, u8 reg, u8 data)
8282
static int bd6107_backlight_update_status(struct backlight_device *backlight)
8383
{
8484
struct bd6107 *bd = bl_get_data(backlight);
85-
int brightness = backlight->props.brightness;
86-
87-
if (backlight->props.power != FB_BLANK_UNBLANK ||
88-
backlight->props.fb_blank != FB_BLANK_UNBLANK ||
89-
backlight->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
90-
brightness = 0;
85+
int brightness = backlight_get_brightness(backlight);
9186

9287
if (brightness) {
9388
bd6107_write(bd, BD6107_PORTSEL, BD6107_PORTSEL_LEDM(2) |

‎drivers/video/backlight/corgi_lcd.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,7 @@ static int corgi_bl_set_intensity(struct corgi_lcd *lcd, int intensity)
420420
static int corgi_bl_update_status(struct backlight_device *bd)
421421
{
422422
struct corgi_lcd *lcd = bl_get_data(bd);
423-
int intensity = bd->props.brightness;
424-
425-
if (bd->props.power != FB_BLANK_UNBLANK)
426-
intensity = 0;
427-
428-
if (bd->props.fb_blank != FB_BLANK_UNBLANK)
429-
intensity = 0;
423+
int intensity = backlight_get_brightness(bd);
430424

431425
if (corgibl_flags & CORGIBL_SUSPENDED)
432426
intensity = 0;

‎drivers/video/backlight/da903x_bl.c‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,7 @@ static int da903x_backlight_set(struct backlight_device *bl, int brightness)
7777

7878
static int da903x_backlight_update_status(struct backlight_device *bl)
7979
{
80-
int brightness = bl->props.brightness;
81-
82-
if (bl->props.power != FB_BLANK_UNBLANK)
83-
brightness = 0;
84-
85-
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
86-
brightness = 0;
87-
88-
if (bl->props.state & BL_CORE_SUSPENDED)
89-
brightness = 0;
90-
91-
return da903x_backlight_set(bl, brightness);
80+
return da903x_backlight_set(bl, backlight_get_brightness(bl));
9281
}
9382

9483
static int da903x_backlight_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/ep93xx_bl.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ static int ep93xxbl_set(struct backlight_device *bl, int brightness)
3636

3737
static int ep93xxbl_update_status(struct backlight_device *bl)
3838
{
39-
int brightness = bl->props.brightness;
40-
41-
if (bl->props.power != FB_BLANK_UNBLANK ||
42-
bl->props.fb_blank != FB_BLANK_UNBLANK)
43-
brightness = 0;
44-
45-
return ep93xxbl_set(bl, brightness);
39+
return ep93xxbl_set(bl, backlight_get_brightness(bl));
4640
}
4741

4842
static int ep93xxbl_get_brightness(struct backlight_device *bl)

‎drivers/video/backlight/hp680_bl.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@ static void hp680bl_send_intensity(struct backlight_device *bd)
3333
{
3434
unsigned long flags;
3535
u16 v;
36-
int intensity = bd->props.brightness;
36+
int intensity = backlight_get_brightness(bd);
3737

38-
if (bd->props.power != FB_BLANK_UNBLANK)
39-
intensity = 0;
40-
if (bd->props.fb_blank != FB_BLANK_UNBLANK)
41-
intensity = 0;
4238
if (hp680bl_suspended)
4339
intensity = 0;
4440

‎drivers/video/backlight/kb3886_bl.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,8 @@ static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
8787

8888
static int kb3886bl_send_intensity(struct backlight_device *bd)
8989
{
90-
int intensity = bd->props.brightness;
90+
int intensity = backlight_get_brightness(bd);
9191

92-
if (bd->props.power != FB_BLANK_UNBLANK)
93-
intensity = 0;
94-
if (bd->props.fb_blank != FB_BLANK_UNBLANK)
95-
intensity = 0;
9692
if (kb3886bl_flags & KB3886BL_SUSPENDED)
9793
intensity = 0;
9894

0 commit comments

Comments
 (0)