Skip to content

Commit 96f970f

Browse files
torvaldstorvalds
committed
Merge tag 'backlight-next-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones: "Core Framework: - Trivial: Code refactoring - New API backlight_is_blank() - New API backlight_get_brightness() - Additional/reworked documentation - Remove 'extern' labels from prototypes - Drop backlight_put() - Staticify of_find_backlight() Driver Removal: - Removal of unused OT200 driver - Removal of unused Generic Backlight driver Fix-ups - Bunch of W=1 warning fixes - Convert to GPIO descriptors; sky81452 - Move platform data handling into driver; sky81452 - Remove superfluous code; lms501kf03 - Many instances of using new APIs" * tag 'backlight-next-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (34 commits) video: backlight: cr_bllcd: Remove unused variable 'intensity' backlight: backlight: Make of_find_backlight static backlight: backlight: Drop backlight_put() backlight: Use backlight_get_brightness() throughout backlight: jornada720_bl: Introduce backlight_is_blank() backlight: gpio_backlight: Simplify update_status() backlight: cr_bllcd: Introduce gpio-backlight semantics backlight: as3711_bl: Simplify update_status backlight: backlight: Introduce backlight_get_brightness() doc-rst: Wire-up Backlight kernel-doc documentation backlight: backlight: Add overview and update existing doc backlight: backlight: Drop extern from prototypes backlight: generic_bl: Remove this driver as it is unused backlight: backlight: Document enums in backlight.h backlight: backlight: Document inline functions in backlight.h backlight: backlight: Improve backlight_device documentation backlight: backlight: Improve backlight_properties documentation backlight: backlight: Improve backlight_ops documentation backlight: backlight: Add backlight_is_blank() backlight: backlight: Refactor fb_notifier_callback() ...
2 parents c636eef + 7eb99a3 commit 96f970f

39 files changed

Lines changed: 538 additions & 717 deletions

‎Documentation/gpu/backlight.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
=================
2+
Backlight support
3+
=================
4+
5+
.. kernel-doc:: drivers/video/backlight/backlight.c
6+
:doc: overview
7+
8+
.. kernel-doc:: include/linux/backlight.h
9+
:internal:
10+
11+
.. kernel-doc:: drivers/video/backlight/backlight.c
12+
:export:

‎Documentation/gpu/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Linux GPU Driver Developer's Guide
1212
drm-uapi
1313
drm-client
1414
drivers
15+
backlight
1516
vga-switcheroo
1617
vgaarbiter
1718
todo

‎drivers/mfd/sky81452.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ static int sky81452_probe(struct i2c_client *client,
4747
memset(cells, 0, sizeof(cells));
4848
cells[0].name = "sky81452-backlight";
4949
cells[0].of_compatible = "skyworks,sky81452-backlight";
50-
cells[0].platform_data = pdata->bl_pdata;
51-
cells[0].pdata_size = sizeof(*pdata->bl_pdata);
5250
cells[1].name = "sky81452-regulator";
5351
cells[1].platform_data = pdata->regulator_init_data;
5452
cells[1].pdata_size = sizeof(*pdata->regulator_init_data);

‎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/Kconfig‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,6 @@ config BACKLIGHT_EP93XX
173173
To compile this driver as a module, choose M here: the module will
174174
be called ep93xx_bl.
175175

176-
config BACKLIGHT_GENERIC
177-
tristate "Generic (aka Sharp Corgi) Backlight Driver"
178-
default y
179-
help
180-
Say y to enable the generic platform backlight driver previously
181-
known as the Corgi backlight driver. If you have a Sharp Zaurus
182-
SL-C7xx, SL-Cxx00 or SL-6000x say y.
183-
184176
config BACKLIGHT_IPAQ_MICRO
185177
tristate "iPAQ microcontroller backlight driver"
186178
depends on MFD_IPAQ_MICRO
@@ -386,13 +378,6 @@ config BACKLIGHT_LP8788
386378
help
387379
This supports TI LP8788 backlight driver.
388380

389-
config BACKLIGHT_OT200
390-
tristate "Backlight driver for ot200 visualisation device"
391-
depends on CS5535_MFGPT && GPIO_CS5535
392-
help
393-
To compile this driver as a module, choose M here: the module will be
394-
called ot200_bl.
395-
396381
config BACKLIGHT_PANDORA
397382
tristate "Backlight driver for Pandora console"
398383
depends on TWL4030_CORE

‎drivers/video/backlight/Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
3131
obj-$(CONFIG_BACKLIGHT_DA903X) += da903x_bl.o
3232
obj-$(CONFIG_BACKLIGHT_DA9052) += da9052_bl.o
3333
obj-$(CONFIG_BACKLIGHT_EP93XX) += ep93xx_bl.o
34-
obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o
3534
obj-$(CONFIG_BACKLIGHT_GPIO) += gpio_backlight.o
3635
obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
3736
obj-$(CONFIG_BACKLIGHT_HP700) += jornada720_bl.o
@@ -45,7 +44,6 @@ obj-$(CONFIG_BACKLIGHT_LP8788) += lp8788_bl.o
4544
obj-$(CONFIG_BACKLIGHT_LV5207LP) += lv5207lp.o
4645
obj-$(CONFIG_BACKLIGHT_MAX8925) += max8925_bl.o
4746
obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o
48-
obj-$(CONFIG_BACKLIGHT_OT200) += ot200_bl.o
4947
obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o
5048
obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o
5149
obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o

‎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/as3711_bl.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,10 @@ static int as3711_bl_update_status(struct backlight_device *bl)
104104
struct as3711_bl_data *data = bl_get_data(bl);
105105
struct as3711_bl_supply *supply = to_supply(data);
106106
struct as3711 *as3711 = supply->as3711;
107-
int brightness = bl->props.brightness;
107+
int brightness;
108108
int ret = 0;
109109

110-
dev_dbg(&bl->dev, "%s(): brightness %u, pwr %x, blank %x, state %x\n",
111-
__func__, bl->props.brightness, bl->props.power,
112-
bl->props.fb_blank, bl->props.state);
113-
114-
if (bl->props.power != FB_BLANK_UNBLANK ||
115-
bl->props.fb_blank != FB_BLANK_UNBLANK ||
116-
bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
117-
brightness = 0;
110+
brightness = backlight_get_brightness(bl);
118111

119112
if (data->type == AS3711_BL_SU1) {
120113
ret = as3711_set_brightness_v(as3711, brightness,

0 commit comments

Comments
 (0)