mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
backlight: set backlight type and max_brightness before backlights are registered
Since commita19a6ee
"backlight: Allow properties to be passed at registration" and commitbb7ca74
"backlight: add backlight type", we can set backlight type and max_brightness before backlights are registered. Some newly added drivers did not set it properly, let's fix it. Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Matthew Garrett <mjg@redhat.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Donghwa Lee <dh09.lee@samsung.com> Cc: InKi Dae <inki.dae@samsung.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a4c8aaa559
commit
ef22f6a70c
3 changed files with 18 additions and 8 deletions
|
@ -479,6 +479,7 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
|
|||
struct ams369fg06 *lcd = NULL;
|
||||
struct lcd_device *ld = NULL;
|
||||
struct backlight_device *bd = NULL;
|
||||
struct backlight_properties props;
|
||||
|
||||
lcd = kzalloc(sizeof(struct ams369fg06), GFP_KERNEL);
|
||||
if (!lcd)
|
||||
|
@ -511,16 +512,18 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
|
|||
|
||||
lcd->ld = ld;
|
||||
|
||||
memset(&props, 0, sizeof(struct backlight_properties));
|
||||
props.type = BACKLIGHT_RAW;
|
||||
props.max_brightness = MAX_BRIGHTNESS;
|
||||
|
||||
bd = backlight_device_register("ams369fg06-bl", &spi->dev, lcd,
|
||||
&ams369fg06_backlight_ops, NULL);
|
||||
&ams369fg06_backlight_ops, &props);
|
||||
if (IS_ERR(bd)) {
|
||||
ret = PTR_ERR(bd);
|
||||
goto out_lcd_unregister;
|
||||
}
|
||||
|
||||
bd->props.max_brightness = MAX_BRIGHTNESS;
|
||||
bd->props.brightness = DEFAULT_BRIGHTNESS;
|
||||
bd->props.type = BACKLIGHT_RAW;
|
||||
lcd->bd = bd;
|
||||
|
||||
if (!lcd->lcd_pd->lcd_enabled) {
|
||||
|
|
|
@ -668,6 +668,7 @@ static int ld9040_probe(struct spi_device *spi)
|
|||
struct ld9040 *lcd = NULL;
|
||||
struct lcd_device *ld = NULL;
|
||||
struct backlight_device *bd = NULL;
|
||||
struct backlight_properties props;
|
||||
|
||||
lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL);
|
||||
if (!lcd)
|
||||
|
@ -699,14 +700,17 @@ static int ld9040_probe(struct spi_device *spi)
|
|||
|
||||
lcd->ld = ld;
|
||||
|
||||
memset(&props, 0, sizeof(struct backlight_properties));
|
||||
props.type = BACKLIGHT_RAW;
|
||||
props.max_brightness = MAX_BRIGHTNESS;
|
||||
|
||||
bd = backlight_device_register("ld9040-bl", &spi->dev,
|
||||
lcd, &ld9040_backlight_ops, NULL);
|
||||
lcd, &ld9040_backlight_ops, &props);
|
||||
if (IS_ERR(bd)) {
|
||||
ret = PTR_ERR(bd);
|
||||
goto out_unregister_lcd;
|
||||
}
|
||||
|
||||
bd->props.max_brightness = MAX_BRIGHTNESS;
|
||||
bd->props.brightness = MAX_BRIGHTNESS;
|
||||
lcd->bd = bd;
|
||||
|
||||
|
|
|
@ -738,6 +738,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
|
|||
struct s6e63m0 *lcd = NULL;
|
||||
struct lcd_device *ld = NULL;
|
||||
struct backlight_device *bd = NULL;
|
||||
struct backlight_properties props;
|
||||
|
||||
lcd = kzalloc(sizeof(struct s6e63m0), GFP_KERNEL);
|
||||
if (!lcd)
|
||||
|
@ -769,16 +770,18 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
|
|||
|
||||
lcd->ld = ld;
|
||||
|
||||
memset(&props, 0, sizeof(struct backlight_properties));
|
||||
props.type = BACKLIGHT_RAW;
|
||||
props.max_brightness = MAX_BRIGHTNESS;
|
||||
|
||||
bd = backlight_device_register("s6e63m0bl-bl", &spi->dev, lcd,
|
||||
&s6e63m0_backlight_ops, NULL);
|
||||
&s6e63m0_backlight_ops, &props);
|
||||
if (IS_ERR(bd)) {
|
||||
ret = PTR_ERR(bd);
|
||||
goto out_lcd_unregister;
|
||||
}
|
||||
|
||||
bd->props.max_brightness = MAX_BRIGHTNESS;
|
||||
bd->props.brightness = MAX_BRIGHTNESS;
|
||||
bd->props.type = BACKLIGHT_RAW;
|
||||
lcd->bd = bd;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue