backlight: set backlight type and max_brightness before backlights are registered

Since commit a19a6ee "backlight: Allow properties to be passed at
registration" and commit bb7ca74 "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>

diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 2c314303f9156455c5313d989d7a0cf79ab167e7..9f0a491e2a05adeefd802e9fb05c0076946e869b 100644 (file)
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -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) {

diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 62bcde3c97f2832a1c27a907e6ef1ec7f7cc72c4..5934655eb1ffa8480558353cea82eea66113521a 100644 (file)
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -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;
 

diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index e1803ba231760b828d7066b6c1da966867fb0545..694e5aab0d69b5ff5a66ba6f102d609bd70828a9 100644 (file)
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -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;
 
        /*