Merge tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2014 10:38:33 +0000 (06:38 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2014 10:38:33 +0000 (06:38 -0400)
Pull backlight driver updates from Lee Jones:
 "Changes to existing drivers:
   - Checkpatch fixes
   - Removal of unused code in generic_bl
   - Removal of superfluous .owner attribute

  No new or removed drivers/supported devices"

* tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: omap1: add blank line after declarations
  backlight: jornada720: Remove 'else' after a return
  backlight: jornada720: Remove 'else' after a return
  backlight: wm831x_bl: Add blank line after declarations
  backlight: tdo24m: Add blank line after declarations
  backlight: s6e63m0: Remove 'else' after a return
  backlight: pcf50633: Add blank line after declarations
  backlight: lp855x: Add blank line after declarations
  backlight: lms501kf03: Remove 'else' after a return
  backlight: lm3639: Remove unnecessary return statements
  backlight: ld9040: Remove 'else' after a return
  backlight: ili922x: Remove 'else' after a return
  backlight: cr_bllcd: Add blank line after declarations
  backlight: corgi_lcd: Add blank line after declarations
  backlight: ams369fg06: Remove 'else' after a return
  backlight: adp8870: Add blank line after declarations
  backlight: adp8860: Add blank line after declarations
  backlight: adp5520: Add blank line after declarations
  backlight: generic_bl: Remove unused function
  backlight: Remove .owner field for drivers using module_platform_driver

34 files changed:
drivers/video/backlight/88pm860x_bl.c
drivers/video/backlight/aat2870_bl.c
drivers/video/backlight/adp5520_bl.c
drivers/video/backlight/adp8860_bl.c
drivers/video/backlight/adp8870_bl.c
drivers/video/backlight/ams369fg06.c
drivers/video/backlight/as3711_bl.c
drivers/video/backlight/corgi_lcd.c
drivers/video/backlight/cr_bllcd.c
drivers/video/backlight/da903x_bl.c
drivers/video/backlight/da9052_bl.c
drivers/video/backlight/ep93xx_bl.c
drivers/video/backlight/generic_bl.c
drivers/video/backlight/gpio_backlight.c
drivers/video/backlight/ili922x.c
drivers/video/backlight/jornada720_bl.c
drivers/video/backlight/jornada720_lcd.c
drivers/video/backlight/ld9040.c
drivers/video/backlight/lm3533_bl.c
drivers/video/backlight/lm3639_bl.c
drivers/video/backlight/lms501kf03.c
drivers/video/backlight/lp855x_bl.c
drivers/video/backlight/lp8788_bl.c
drivers/video/backlight/max8925_bl.c
drivers/video/backlight/omap1_bl.c
drivers/video/backlight/ot200_bl.c
drivers/video/backlight/pandora_bl.c
drivers/video/backlight/pcf50633-backlight.c
drivers/video/backlight/platform_lcd.c
drivers/video/backlight/pwm_bl.c
drivers/video/backlight/s6e63m0.c
drivers/video/backlight/tdo24m.c
drivers/video/backlight/tps65217_bl.c
drivers/video/backlight/wm831x_bl.c

index a6f7cc0a088352c9695196b442a2153e57abb662..9a23698b6fe8398c1025ea3a234db11a4779ba09 100644 (file)
@@ -265,7 +265,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
 static struct platform_driver pm860x_backlight_driver = {
        .driver         = {
                .name   = "88pm860x-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = pm860x_backlight_probe,
 };
index 86234c31d79c0a1afb3ae05660f3472342ed1d50..50774e6577003d6fa8f7bb6f03d079fae1191530 100644 (file)
@@ -211,7 +211,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
 static struct platform_driver aat2870_bl_driver = {
        .driver = {
                .name   = "aat2870-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = aat2870_bl_probe,
        .remove         = aat2870_bl_remove,
index f37097a261a210f1c168def54c2ef22e6fa6e965..dd88ba1d71ceb64849535542a8cb3289d89df4c1 100644 (file)
@@ -67,6 +67,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;
 
@@ -374,7 +375,6 @@ static SIMPLE_DEV_PM_OPS(adp5520_bl_pm_ops, adp5520_bl_suspend,
 static struct platform_driver adp5520_bl_driver = {
        .driver         = {
                .name   = "adp5520-backlight",
-               .owner  = THIS_MODULE,
                .pm     = &adp5520_bl_pm_ops,
        },
        .probe          = adp5520_bl_probe,
index be8d83deca7d5a2a7ca563873a7008d33599541b..71147f4461b8cb57fc3a0b62b502bc97bdac843b 100644 (file)
@@ -181,6 +181,7 @@ static int adp8860_clr_bits(struct i2c_client *client, int reg, uint8_t bit_mask
 static void adp8860_led_work(struct work_struct *work)
 {
        struct adp8860_led *led = container_of(work, struct adp8860_led, work);
+
        adp8860_write(led->client, ADP8860_ISC1 - led->id + 1,
                         led->new_brightness >> 1);
 }
@@ -362,6 +363,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;
 
@@ -499,6 +501,7 @@ static ssize_t adp8860_bl_l1_daylight_max_store(struct device *dev,
 {
        struct adp8860_bl *data = dev_get_drvdata(dev);
        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
+
        if (ret)
                return ret;
 
index 251af4d38d8648add6c2323c34fe24a7e048a772..037e430833435457381f2c282b3839e2a8964dc5 100644 (file)
@@ -144,6 +144,7 @@ static int adp8870_read(struct i2c_client *client, int reg, uint8_t *val)
 static int adp8870_write(struct i2c_client *client, u8 reg, u8 val)
 {
        int ret = i2c_smbus_write_byte_data(client, reg, val);
+
        if (ret)
                dev_err(&client->dev, "failed to write\n");
 
@@ -195,6 +196,7 @@ static int adp8870_clr_bits(struct i2c_client *client, int reg, uint8_t bit_mask
 static void adp8870_led_work(struct work_struct *work)
 {
        struct adp8870_led *led = container_of(work, struct adp8870_led, work);
+
        adp8870_write(led->client, ADP8870_ISC1 + led->id - 1,
                         led->new_brightness >> 1);
 }
@@ -399,6 +401,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;
 
@@ -649,6 +652,7 @@ static ssize_t adp8870_bl_l1_daylight_max_store(struct device *dev,
 {
        struct adp8870_bl *data = dev_get_drvdata(dev);
        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
+
        if (ret)
                return ret;
 
index 4726c8be626f3dc794dfb137da1353a0d69ed887..5f897f99cc9b68c154207bfaad4461137977ea97 100644 (file)
@@ -325,11 +325,11 @@ static int ams369fg06_power_on(struct ams369fg06 *lcd)
        if (!pd->reset) {
                dev_err(lcd->dev, "reset is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->reset(lcd->ld);
-               msleep(pd->reset_delay);
        }
 
+       pd->reset(lcd->ld);
+       msleep(pd->reset_delay);
+
        ret = ams369fg06_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");
index bb1fc45b7549e7b0ffd4b49fc1cbce8512e4b0a5..734a9158946b1f805a3738d9e9c31f25cf8b3314 100644 (file)
@@ -467,7 +467,6 @@ static int as3711_backlight_probe(struct platform_device *pdev)
 static struct platform_driver as3711_backlight_driver = {
        .driver         = {
                .name   = "as3711-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = as3711_backlight_probe,
 };
index 51d18d637e2b88f02a9ff6ff1ff9702645d07d73..d7c37a8ccd1fbabe00063ded2bb0337e184e73db 100644 (file)
@@ -143,6 +143,7 @@ static void lcdtg_i2c_send_byte(struct corgi_lcd *lcd,
                                uint8_t base, uint8_t data)
 {
        int i;
+
        for (i = 0; i < 8; i++) {
                if (data & 0x80)
                        lcdtg_i2c_send_bit(lcd, base | POWER0_COM_DOUT);
index f3fed9ef745f5aca7290677a2f6ae8d866be151e..3e3880fc8c8e3926cde346259d463aa0703dc469 100644 (file)
@@ -235,6 +235,7 @@ static int cr_backlight_probe(struct platform_device *pdev)
 static int cr_backlight_remove(struct platform_device *pdev)
 {
        struct cr_panel *crp = platform_get_drvdata(pdev);
+
        crp->cr_backlight_device->props.power = FB_BLANK_POWERDOWN;
        crp->cr_backlight_device->props.brightness = 0;
        crp->cr_backlight_device->props.max_brightness = 0;
index 12c5d840c5909e173fcf34492487b6409f479f67..f793738f06fbe142b454c7cf677ead073aef5f09 100644 (file)
@@ -162,7 +162,6 @@ static int da903x_backlight_probe(struct platform_device *pdev)
 static struct platform_driver da903x_backlight_driver = {
        .driver         = {
                .name   = "da903x-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = da903x_backlight_probe,
 };
index 20d55becaa7434e76704a7a59771ab413014b09f..d4bd74bd5070709215c6ec4db409af67c841c4e8 100644 (file)
@@ -173,7 +173,6 @@ static struct platform_driver da9052_wled_driver = {
        .id_table       = da9052_wled_ids,
        .driver = {
                .name   = "da9052-wled",
-               .owner  = THIS_MODULE,
        },
 };
 
index 0d1f633c6480190d8dc90d0d122832b4e4c98174..0067931821c677b0bcb542d3aa3004633f2479ac 100644 (file)
@@ -128,7 +128,6 @@ static SIMPLE_DEV_PM_OPS(ep93xxbl_pm_ops, ep93xxbl_suspend, ep93xxbl_resume);
 static struct platform_driver ep93xxbl_driver = {
        .driver         = {
                .name   = "ep93xx-bl",
-               .owner  = THIS_MODULE,
                .pm     = &ep93xxbl_pm_ops,
        },
        .probe          = ep93xxbl_probe,
index 5d8d65200db77b739154c44e394138bc8b332641..67dfb939a51428f1fb1a54381bfde0b56d53fe8e 100644 (file)
@@ -52,24 +52,6 @@ static int genericbl_get_intensity(struct backlight_device *bd)
        return genericbl_intensity;
 }
 
-/*
- * Called when the battery is low to limit the backlight intensity.
- * If limit==0 clear any limit, otherwise limit the intensity
- */
-void genericbl_limit_intensity(int limit)
-{
-       struct backlight_device *bd = generic_backlight_device;
-
-       mutex_lock(&bd->ops_lock);
-       if (limit)
-               bd->props.state |= GENERICBL_BATTLOW;
-       else
-               bd->props.state &= ~GENERICBL_BATTLOW;
-       backlight_update_status(generic_backlight_device);
-       mutex_unlock(&bd->ops_lock);
-}
-EXPORT_SYMBOL(genericbl_limit_intensity);
-
 static const struct backlight_ops genericbl_ops = {
        .options = BL_CORE_SUSPENDRESUME,
        .get_brightness = genericbl_get_intensity,
index aaead04a2d541c838e02d7611f42d0c29a1a1084..439feb2389a8cc3d70a45d7a2a3eac431d4f8db9 100644 (file)
@@ -151,7 +151,6 @@ static struct of_device_id gpio_backlight_of_match[] = {
 static struct platform_driver gpio_backlight_driver = {
        .driver         = {
                .name           = "gpio-backlight",
-               .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(gpio_backlight_of_match),
        },
        .probe          = gpio_backlight_probe,
index ea67fe199e34ed880c305fa1b0ca26f330eccccd..e7f0890cc21142f947eaf41e6975e5007ecf96ce 100644 (file)
@@ -495,17 +495,18 @@ static int ili922x_probe(struct spi_device *spi)
                        "no LCD found: Chip ID 0x%x, ret %d\n",
                        reg, ret);
                return -ENODEV;
-       } else {
-               dev_info(&spi->dev, "ILI%x found, SPI freq %d, mode %d\n",
-                        reg, spi->max_speed_hz, spi->mode);
        }
 
+       dev_info(&spi->dev, "ILI%x found, SPI freq %d, mode %d\n",
+                reg, spi->max_speed_hz, spi->mode);
+
        ret = ili922x_read_status(spi, &reg);
        if (ret) {
                dev_err(&spi->dev, "reading RS failed...\n");
                return ret;
-       } else
-               dev_dbg(&spi->dev, "status: 0x%x\n", reg);
+       }
+
+       dev_dbg(&spi->dev, "status: 0x%x\n", reg);
 
        ili922x_display_init(spi);
 
index 6ce96b4a879696bc04457b329f2f39e16bb5e7ed..7e6ff53468924bcb246a81ad018dcbb397e54ea4 100644 (file)
@@ -41,11 +41,11 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
                dev_err(&bd->dev, "get brightness timeout\n");
                jornada_ssp_end();
                return -ETIMEDOUT;
-       } else {
-               /* exchange txdummy for value */
-               ret = jornada_ssp_byte(TXDUMMY);
        }
 
+       /* exchange txdummy for value */
+       ret = jornada_ssp_byte(TXDUMMY);
+
        jornada_ssp_end();
 
        return BL_MAX_BRIGHT - ret;
index 228bc319de1922251d3c4cffb5adf190c375393b..dfa0fa0d5c782c082efcd04fe9a5f1ed964787a4 100644 (file)
 
 static int jornada_lcd_get_power(struct lcd_device *ld)
 {
-       /* LDD2 in PPC = LCD POWER */
-       if (PPSR & PPC_LDD2)
-               return FB_BLANK_UNBLANK;        /* PW ON */
-       else
-               return FB_BLANK_POWERDOWN;      /* PW OFF */
+       return PPSR & PPC_LDD2 ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
 }
 
 static int jornada_lcd_get_contrast(struct lcd_device *ld)
index ccb44e8e492721e981bc09dd98e58338020f6c48..f71eaf10c4ebddac11a32b5ec5baf03519743dc0 100644 (file)
@@ -566,11 +566,11 @@ static int ld9040_power_on(struct ld9040 *lcd)
        if (!pd->reset) {
                dev_err(lcd->dev, "reset is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->reset(lcd->ld);
-               msleep(pd->reset_delay);
        }
 
+       pd->reset(lcd->ld);
+       msleep(pd->reset_delay);
+
        ret = ld9040_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");
index cff1fbe89a1bf547ed206e7979352dfaa4b0692b..0e2337f367b61bfa0639ef62a4e3c40f01b510cd 100644 (file)
@@ -397,7 +397,6 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
 static struct platform_driver lm3533_bl_driver = {
        .driver = {
                .name   = "lm3533-backlight",
-               .owner  = THIS_MODULE,
                .pm     = &lm3533_bl_pm_ops,
        },
        .probe          = lm3533_bl_probe,
index 5f36808d214f0d27665ced0baaf87e4f9a95b6ff..cd50df5807eadb2b4bf18b6fa8efc906beda0dee 100644 (file)
@@ -254,7 +254,6 @@ static void lm3639_torch_brightness_set(struct led_classdev *cdev,
        return;
 out:
        dev_err(pchip->dev, "i2c failed to access register\n");
-       return;
 }
 
 /* flash */
@@ -293,7 +292,6 @@ static void lm3639_flash_brightness_set(struct led_classdev *cdev,
        return;
 out:
        dev_err(pchip->dev, "i2c failed to access register\n");
-       return;
 }
 
 static const struct regmap_config lm3639_regmap = {
index 77258b7b04be288214cba7ee141bf87402c514cf..7e3810308c3e456e56d5f5e6512fbef0bbc2d7dd 100644 (file)
@@ -232,19 +232,19 @@ static int lms501kf03_power_on(struct lms501kf03 *lcd)
        if (!pd->power_on) {
                dev_err(lcd->dev, "power_on is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->power_on(lcd->ld, 1);
-               msleep(pd->power_on_delay);
        }
 
+       pd->power_on(lcd->ld, 1);
+       msleep(pd->power_on_delay);
+
        if (!pd->reset) {
                dev_err(lcd->dev, "reset is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->reset(lcd->ld);
-               msleep(pd->reset_delay);
        }
 
+       pd->reset(lcd->ld);
+       msleep(pd->reset_delay);
+
        ret = lms501kf03_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");
index dcdd5443efcf42237b0821963933c9b87a65c900..25fb8e3d75b16765e74198cacdf9e816ca84b3ea 100644 (file)
@@ -268,6 +268,7 @@ static int lp855x_bl_update_status(struct backlight_device *bl)
 
        } else if (lp->mode == REGISTER_BASED) {
                u8 val = bl->props.brightness;
+
                lp855x_write_byte(lp, lp->cfg->reg_brightness, val);
        }
 
@@ -308,6 +309,7 @@ static ssize_t lp855x_get_chip_id(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
        struct lp855x *lp = dev_get_drvdata(dev);
+
        return scnprintf(buf, PAGE_SIZE, "%s\n", lp->chipname);
 }
 
index d6c4f6a2d43e2a1c2ec872b061ddd408217a3537..e418d5b1aa55a6973ae1dfee8968f8d7baa778ca 100644 (file)
@@ -315,7 +315,6 @@ static struct platform_driver lp8788_bl_driver = {
        .remove = lp8788_backlight_remove,
        .driver = {
                .name = LP8788_DEV_BACKLIGHT,
-               .owner = THIS_MODULE,
        },
 };
 module_platform_driver(lp8788_bl_driver);
index 66fa08c920d25c61e492e8e639f5eea722835a36..7b738d60ecc22e27560e42c9cef0669628e4aa28 100644 (file)
@@ -197,7 +197,6 @@ static int max8925_backlight_probe(struct platform_device *pdev)
 static struct platform_driver max8925_backlight_driver = {
        .driver         = {
                .name   = "max8925-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = max8925_backlight_probe,
 };
index a0dcd88ac74fce38d77531df242a690c4bc1eb12..546d94df21d53ac436891273828058043acb2c2d 100644 (file)
@@ -120,6 +120,7 @@ static int omapbl_update_status(struct backlight_device *dev)
 static int omapbl_get_intensity(struct backlight_device *dev)
 {
        struct omap_backlight *bl = bl_get_data(dev);
+
        return bl->current_intensity;
 }
 
index f5a5202dd79d4c1cbba5b11631f323fa5bf59ee3..3acdb9f646ed05792fa047eb5272d03a23e8eef6 100644 (file)
@@ -152,7 +152,6 @@ static int ot200_backlight_remove(struct platform_device *pdev)
 static struct platform_driver ot200_backlight_driver = {
        .driver         = {
                .name   = "ot200-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = ot200_backlight_probe,
        .remove         = ot200_backlight_remove,
index 2e3f82063c03b7243eed9b077c14e0b081297724..5d8bb8b201835ddf96ed1a5465ed25f682a2a9e8 100644 (file)
@@ -142,7 +142,6 @@ static int pandora_backlight_probe(struct platform_device *pdev)
 static struct platform_driver pandora_backlight_driver = {
        .driver         = {
                .name   = "pandora-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = pandora_backlight_probe,
 };
index b95d3b0aaffee03dc5f5f0380d91b456ea5293cb..85bd573b6d15c1b248fefb9addc5fd755772b635 100644 (file)
@@ -90,6 +90,7 @@ static int pcf50633_bl_update_status(struct backlight_device *bl)
 static int pcf50633_bl_get_brightness(struct backlight_device *bl)
 {
        struct pcf50633_bl *pcf_bl = bl_get_data(bl);
+
        return pcf_bl->brightness;
 }
 
index c3d2e209fc8f5b2ed148c30deeb5bffe970756a2..872a3bf21fafc014a5ee0453d9001485543b95ff 100644 (file)
@@ -148,7 +148,6 @@ MODULE_DEVICE_TABLE(of, platform_lcd_of_match);
 static struct platform_driver platform_lcd_driver = {
        .driver         = {
                .name   = "platform-lcd",
-               .owner  = THIS_MODULE,
                .pm     = &platform_lcd_pm_ops,
                .of_match_table = of_match_ptr(platform_lcd_of_match),
        },
index b85983e97f0afbc70665d1aa134d5b182e25976e..cb5ae4c08469c57304f337ae862bf46a11b58ac3 100644 (file)
@@ -390,7 +390,6 @@ static const struct dev_pm_ops pwm_backlight_pm_ops = {
 static struct platform_driver pwm_backlight_driver = {
        .driver         = {
                .name           = "pwm-backlight",
-               .owner          = THIS_MODULE,
                .pm             = &pwm_backlight_pm_ops,
                .of_match_table = of_match_ptr(pwm_backlight_of_match),
        },
index f3a65c8940ed9dae8c03fb115b23f09d3df87e39..28bfa127fee45aca7a0bd4c193efa47cb8d80e58 100644 (file)
@@ -507,19 +507,19 @@ static int s6e63m0_power_on(struct s6e63m0 *lcd)
        if (!pd->power_on) {
                dev_err(lcd->dev, "power_on is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->power_on(lcd->ld, 1);
-               msleep(pd->power_on_delay);
        }
 
+       pd->power_on(lcd->ld, 1);
+       msleep(pd->power_on_delay);
+
        if (!pd->reset) {
                dev_err(lcd->dev, "reset is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->reset(lcd->ld);
-               msleep(pd->reset_delay);
        }
 
+       pd->reset(lcd->ld);
+       msleep(pd->reset_delay);
+
        ret = s6e63m0_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");
index 908016fc5829ff3ef0667f5be62c51999d30106e..30afce33ef2afcfa364e3aa622d09a48b152d94e 100644 (file)
@@ -300,12 +300,14 @@ static int tdo24m_power(struct tdo24m *lcd, int power)
 static int tdo24m_set_power(struct lcd_device *ld, int power)
 {
        struct tdo24m *lcd = lcd_get_data(ld);
+
        return tdo24m_power(lcd, power);
 }
 
 static int tdo24m_get_power(struct lcd_device *ld)
 {
        struct tdo24m *lcd = lcd_get_data(ld);
+
        return lcd->power;
 }
 
index 2e04d93aa0efe0a8e687279d81e58c1f2d257d7a..61d72bffd402f25c2abc10266c4241c32ce006e5 100644 (file)
@@ -323,7 +323,6 @@ static int tps65217_bl_probe(struct platform_device *pdev)
 static struct platform_driver tps65217_bl_driver = {
        .probe          = tps65217_bl_probe,
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = "tps65217-bl",
        },
 };
index 8b9455e9306930027b4fa20454b2ac837d8b4ff9..6eab0d6c262aab5d11fa8d4da17f3c5d0e7d8e6c 100644 (file)
@@ -111,6 +111,7 @@ static int wm831x_backlight_update_status(struct backlight_device *bl)
 static int wm831x_backlight_get_brightness(struct backlight_device *bl)
 {
        struct wm831x_backlight_data *data = bl_get_data(bl);
+
        return data->current_brightness;
 }
 
@@ -217,7 +218,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
 static struct platform_driver wm831x_backlight_driver = {
        .driver         = {
                .name   = "wm831x-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = wm831x_backlight_probe,
 };