Merge tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --combined drivers/video/backlight/88pm860x_bl.c
index a6f7cc0a088352c9695196b442a2153e57abb662,6214fc62ad9c6eaf5e89b730a240f8857a26baad..9a23698b6fe8398c1025ea3a234db11a4779ba09
--- 1/drivers/video/backlight/88pm860x_bl.c
--- 2/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@@ -216,7 -216,7 +216,7 @@@ static int pm860x_backlight_probe(struc
        data->reg_duty_cycle = res->start;
        res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on");
        if (!res) {
 -              dev_err(&pdev->dev, "No REG resorce for always on\n");
 +              dev_err(&pdev->dev, "No REG resource for always on\n");
                return -ENXIO;
        }
        data->reg_always_on = res->start;
@@@ -265,7 -265,6 +265,6 @@@
  static struct platform_driver pm860x_backlight_driver = {
        .driver         = {
                .name   = "88pm860x-backlight",
-               .owner  = THIS_MODULE,
        },
        .probe          = pm860x_backlight_probe,
  };

diff --combined drivers/video/backlight/pwm_bl.c
index b85983e97f0afbc70665d1aa134d5b182e25976e,20963ed5077d63d76f308d8a1184664c637ae302..cb5ae4c08469c57304f337ae862bf46a11b58ac3
--- 1/drivers/video/backlight/pwm_bl.c
--- 2/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@@ -173,7 -173,6 +173,7 @@@ static int pwm_backlight_parse_dt(struc
                data->max_brightness--;
        }
  
 +      data->enable_gpio = -EINVAL;
        return 0;
  }
  
@@@ -390,7 -389,6 +390,6 @@@ static const struct dev_pm_ops pwm_back
  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),
        },