27 files changed, 177 insertions, 161 deletions

diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index b7ec34c57f46..c072ed9aea36 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -117,8 +117,8 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
         data->current_brightness = value;
         return 0;
 out:
-        dev_dbg(chip->dev, "set brightness %d failure with return "
-                "value:%d\n", value, ret);
+        dev_dbg(chip->dev, "set brightness %d failure with return value: %d\n",
+                value, ret);
         return ret;
 }
 
@@ -208,22 +208,19 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         res = platform_get_resource_byname(pdev, IORESOURCE_REG, "duty cycle");
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for duty cycle\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         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");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_always_on = res->start;
         res = platform_get_resource_byname(pdev, IORESOURCE_REG, "current");
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for current\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_current = res->start;
 
@@ -231,8 +228,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         sprintf(name, "backlight-%d", pdev->id);
         data->port = pdev->id;
         data->chip = chip;
-        data->i2c = (chip->id == CHIP_PM8606) ? chip->client    \
-                        : chip->companion;
+        data->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion;
         data->current_brightness = MAX_BRIGHTNESS;
         if (pm860x_backlight_dt_init(pdev, data, name)) {
                 if (pdata) {
@@ -263,8 +259,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         return 0;
 out_brt:
         backlight_device_unregister(bl);
-out:
-        devm_kfree(&pdev->dev, data);
         return ret;
 }
 
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index df1cbb7ef6ca..de5e5e74e2a7 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -106,10 +106,9 @@ static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
         pwm_channel_writel(&pwmbl->pwmc, PWM_CPRD,
                         pwmbl->pdata->pwm_compare_max);
 
-        dev_info(&pwmbl->pdev->dev, "Atmel PWM backlight driver "
-                        "(%lu Hz)\n", pwmbl->pwmc.mck /
-                        pwmbl->pdata->pwm_compare_max /
-                        (1 << prescale));
+        dev_info(&pwmbl->pdev->dev, "Atmel PWM backlight driver (%lu Hz)\n",
+                pwmbl->pwmc.mck / pwmbl->pdata->pwm_compare_max /
+                (1 << prescale));
 
         return pwm_channel_enable(&pwmbl->pwmc);
 }
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 297db2fa91f5..345f6660d4b3 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -370,6 +370,35 @@ void backlight_device_unregister(struct backlight_device *bd)
 }
 EXPORT_SYMBOL(backlight_device_unregister);
 
+#ifdef CONFIG_OF
+static int of_parent_match(struct device *dev, void *data)
+{
+        return dev->parent && dev->parent->of_node == data;
+}
+
+/**
+ * of_find_backlight_by_node() - find backlight device by device-tree node
+ * @node: device-tree node of the backlight device
+ *
+ * Returns a pointer to the backlight device corresponding to the given DT
+ * node or NULL if no such backlight device exists or if the device hasn't
+ * been probed yet.
+ *
+ * This function obtains a reference on the backlight device and it is the
+ * caller's responsibility to drop the reference by calling put_device() on
+ * the backlight device's .dev field.
+ */
+struct backlight_device *of_find_backlight_by_node(struct device_node *node)
+{
+        struct device *dev;
+
+        dev = class_find_device(backlight_class, NULL, node, of_parent_match);
+
+        return dev ? to_backlight_device(dev) : NULL;
+}
+EXPORT_SYMBOL(of_find_backlight_by_node);
+#endif
+
 static void __exit backlight_class_exit(void)
 {
         class_destroy(backlight_class);
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index eaaebf21993e..e323fcbe884e 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -6,8 +6,8 @@
  *  Based on Sharp's 2.4 Backlight Driver
  *
  *  Copyright (c) 2008 Marvell International Ltd.
- *      Converted to SPI device based LCD/Backlight device driver
- *      by Eric Miao <eric.miao@marvell.com>
+ *      Converted to SPI device based LCD/Backlight device driver
+ *      by Eric Miao <eric.miao@marvell.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -192,7 +192,7 @@ static void lcdtg_set_phadadj(struct corgi_lcd *lcd, int mode)
 {
         int adj;
 
-        switch(mode) {
+        switch (mode) {
         case CORGI_LCD_MODE_VGA:
                 /* Setting for VGA */
                 adj = sharpsl_param.phadadj;
@@ -409,10 +409,10 @@ static int corgi_bl_set_intensity(struct corgi_lcd *lcd, int intensity)
         cont = !!(intensity & 0x20) ^ lcd->gpio_backlight_cont_inverted;
 
         if (gpio_is_valid(lcd->gpio_backlight_cont))
-                gpio_set_value(lcd->gpio_backlight_cont, cont);
+                gpio_set_value_cansleep(lcd->gpio_backlight_cont, cont);
 
         if (gpio_is_valid(lcd->gpio_backlight_on))
-                gpio_set_value(lcd->gpio_backlight_on, intensity);
+                gpio_set_value_cansleep(lcd->gpio_backlight_on, intensity);
 
         if (lcd->kick_battery)
                 lcd->kick_battery();
@@ -495,8 +495,9 @@ static int setup_gpio_backlight(struct corgi_lcd *lcd,
                 err = devm_gpio_request(&spi->dev, pdata->gpio_backlight_on,
                                         "BL_ON");
                 if (err) {
-                        dev_err(&spi->dev, "failed to request GPIO%d for "
-                                "backlight_on\n", pdata->gpio_backlight_on);
+                        dev_err(&spi->dev,
+                                "failed to request GPIO%d for backlight_on\n",
+                                pdata->gpio_backlight_on);
                         return err;
                 }
 
@@ -508,8 +509,9 @@ static int setup_gpio_backlight(struct corgi_lcd *lcd,
                 err = devm_gpio_request(&spi->dev, pdata->gpio_backlight_cont,
                                         "BL_CONT");
                 if (err) {
-                        dev_err(&spi->dev, "failed to request GPIO%d for "
-                                "backlight_cont\n", pdata->gpio_backlight_cont);
+                        dev_err(&spi->dev,
+                                "failed to request GPIO%d for backlight_cont\n",
+                                pdata->gpio_backlight_cont);
                         return err;
                 }
 
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 573c7ece0fde..8179cef0730f 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -2,10 +2,10 @@
  * Backlight driver for Dialog Semiconductor DA9030/DA9034
  *
  * Copyright (C) 2008 Compulab, Ltd.
- *      Mike Rapoport <mike@compulab.co.il>
+ *      Mike Rapoport <mike@compulab.co.il>
  *
  * Copyright (C) 2006-2008 Marvell International Ltd.
- *      Eric Miao <eric.miao@marvell.com>
+ *      Eric Miao <eric.miao@marvell.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -164,15 +164,14 @@ static int da903x_backlight_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int da903x_backlight_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct backlight_device *bl = dev_get_drvdata(dev);
+
         return da903x_backlight_set(bl, 0);
 }
 
 static int da903x_backlight_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct backlight_device *bl = dev_get_drvdata(dev);
 
         backlight_update_status(bl);
         return 0;
@@ -199,7 +198,7 @@ static struct platform_driver da903x_backlight_driver = {
 module_platform_driver(da903x_backlight_driver);
 
 MODULE_DESCRIPTION("Backlight Driver for Dialog Semiconductor DA9030/DA9034");
-MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>"
-              "Mike Rapoport <mike@compulab.co.il>");
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
+MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:da903x-backlight");
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index ac196181fe45..842da5a3ac4f 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -34,7 +34,7 @@ enum {
         DA9052_TYPE_WLED3,
 };
 
-static unsigned char wled_bank[] = {
+static const unsigned char wled_bank[] = {
         DA9052_LED1_CONF_REG,
         DA9052_LED2_CONF_REG,
         DA9052_LED3_CONF_REG,
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 8c660fcd250d..0ae155be9c89 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -97,8 +97,8 @@ static int genericbl_probe(struct platform_device *pdev)
         props.max_brightness = machinfo->max_intensity;
         bd = backlight_device_register(name, &pdev->dev, NULL, &genericbl_ops,
                                        &props);
-        if (IS_ERR (bd))
-                return PTR_ERR (bd);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
 
         platform_set_drvdata(pdev, bd);
 
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index c99966342448..5cefd73526f8 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -26,7 +26,7 @@
 #define HP680_DEFAULT_INTENSITY 10
 
 static int hp680bl_suspended;
-static int current_intensity = 0;
+static int current_intensity;
 static DEFINE_SPINLOCK(bl_lock);
 
 static void hp680bl_send_intensity(struct backlight_device *bd)
@@ -168,7 +168,7 @@ static int __init hp680bl_init(void)
 static void __exit hp680bl_exit(void)
 {
         platform_device_unregister(hp680bl_device);
-        platform_driver_unregister(&hp680bl_driver);
+        platform_driver_unregister(&hp680bl_driver);
 }
 
 module_init(hp680bl_init);
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 66cc313185ad..1235bf9defc4 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -45,7 +45,7 @@ static inline int ili9320_write_spi(struct ili9320 *ili,
         /* second message is the data to transfer */
 
         data[0] = spi->id | ILI9320_SPI_DATA  | ILI9320_SPI_WRITE;
-        data[1] = value >> 8;
+        data[1] = value >> 8;
         data[2] = value;
 
         return spi_sync(spi->dev, &spi->message);
@@ -56,11 +56,10 @@ int ili9320_write(struct ili9320 *ili, unsigned int reg, unsigned int value)
         dev_dbg(ili->dev, "write: reg=%02x, val=%04x\n", reg, value);
         return ili->write(ili, reg, value);
 }
-
 EXPORT_SYMBOL_GPL(ili9320_write);
 
 int ili9320_write_regs(struct ili9320 *ili,
-                       struct ili9320_reg *values,
+                       const struct ili9320_reg *values,
                        int nr_values)
 {
         int index;
@@ -74,7 +73,6 @@ int ili9320_write_regs(struct ili9320 *ili,
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(ili9320_write_regs);
 
 static void ili9320_reset(struct ili9320 *lcd)
@@ -260,7 +258,6 @@ int ili9320_probe_spi(struct spi_device *spi,
 
         return ret;
 }
-
 EXPORT_SYMBOL_GPL(ili9320_probe_spi);
 
 int ili9320_remove(struct ili9320 *ili)
@@ -271,7 +268,6 @@ int ili9320_remove(struct ili9320 *ili)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(ili9320_remove);
 
 #ifdef CONFIG_PM
@@ -296,20 +292,17 @@ int ili9320_suspend(struct ili9320 *lcd, pm_message_t state)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(ili9320_suspend);
 
 int ili9320_resume(struct ili9320 *lcd)
 {
         dev_info(lcd->dev, "resuming from power state %d\n", lcd->power);
 
-        if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
+        if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP)
                 ili9320_write(lcd, ILI9320_POWER1, 0x00);
-        }
 
         return ili9320_power(lcd, FB_BLANK_UNBLANK);
 }
-
 EXPORT_SYMBOL_GPL(ili9320_resume);
 #endif
 
@@ -318,7 +311,6 @@ void ili9320_shutdown(struct ili9320 *lcd)
 {
         ili9320_power(lcd, FB_BLANK_POWERDOWN);
 }
-
 EXPORT_SYMBOL_GPL(ili9320_shutdown);
 
 MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
diff --git a/drivers/video/backlight/ili9320.h b/drivers/video/backlight/ili9320.h
index e388eca7cac5..e0db738f7bb9 100644
--- a/drivers/video/backlight/ili9320.h
+++ b/drivers/video/backlight/ili9320.h
@@ -63,7 +63,7 @@ extern int ili9320_write(struct ili9320 *ili,
                          unsigned int reg, unsigned int value);
 
 extern int ili9320_write_regs(struct ili9320 *ili,
-                              struct ili9320_reg *values,
+                              const struct ili9320_reg *values,
                               int nr_values);
 
 /* Device probe */
diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 16f593b64427..fef6ce4fad71 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -48,7 +48,7 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
 
         jornada_ssp_end();
 
-        return (BL_MAX_BRIGHT - ret);
+        return BL_MAX_BRIGHT - ret;
 }
 
 static int jornada_bl_update_status(struct backlight_device *bd)
@@ -77,18 +77,23 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                         goto out;
                 }
 
-                /* at this point we expect that the mcu has accepted
-                   our command and is waiting for our new value
-                   please note that maximum brightness is 255,
-                   but due to physical layout it is equal to 0, so we simply
-                   invert the value (MAX VALUE - NEW VALUE). */
-                if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) {
+                /*
+                 * at this point we expect that the mcu has accepted
+                 * our command and is waiting for our new value
+                 * please note that maximum brightness is 255,
+                 * but due to physical layout it is equal to 0, so we simply
+                 * invert the value (MAX VALUE - NEW VALUE).
+                 */
+                if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
+                        != TXDUMMY) {
                         pr_err("set brightness failed\n");
                         ret = -ETIMEDOUT;
                 }
 
-                /* If infact we get an TXDUMMY as output we are happy and dont
-                   make any further comments about it */
+                /*
+                 * If infact we get an TXDUMMY as output we are happy and dont
+                 * make any further comments about it
+                 */
 out:
         jornada_ssp_end();
 
@@ -121,9 +126,11 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
         bd->props.power = FB_BLANK_UNBLANK;
         bd->props.brightness = BL_DEF_BRIGHT;
-        /* note. make sure max brightness is set otherwise
-           you will get seemingly non-related errors when
-           trying to change brightness */
+        /*
+         * note. make sure max brightness is set otherwise
+         * you will get seemingly non-related errors when
+         * trying to change brightness
+         */
         jornada_bl_update_status(bd);
 
         platform_set_drvdata(pdev, bd);
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index f5aa0a5961d6..9a35196d12d7 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -4,7 +4,7 @@
  * Copyright 2007-2009 Freescale Semiconductor, Inc. All Rights Reserved.
  *
  * Copyright (c) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
- *      Inspired by Marek Vasut work in l4f00242t03.c
+ *      Inspired by Marek Vasut work in l4f00242t03.c
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -33,7 +33,6 @@ struct l4f00242t03_priv {
         struct regulator *core_reg;
 };
 
-
 static void l4f00242t03_reset(unsigned int gpio)
 {
         pr_debug("l4f00242t03_reset.\n");
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index a5d0d024bb92..34fb6bd798c8 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -108,7 +108,7 @@ static ssize_t lcd_show_power(struct device *dev, struct device_attribute *attr,
 static ssize_t lcd_store_power(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
-        int rc = -ENXIO;
+        int rc;
         struct lcd_device *ld = to_lcd_device(dev);
         unsigned long power;
 
@@ -116,6 +116,8 @@ static ssize_t lcd_store_power(struct device *dev,
         if (rc)
                 return rc;
 
+        rc = -ENXIO;
+
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_power) {
                 pr_debug("set power to %lu\n", power);
@@ -144,7 +146,7 @@ static ssize_t lcd_show_contrast(struct device *dev,
 static ssize_t lcd_store_contrast(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
-        int rc = -ENXIO;
+        int rc;
         struct lcd_device *ld = to_lcd_device(dev);
         unsigned long contrast;
 
@@ -152,6 +154,8 @@ static ssize_t lcd_store_contrast(struct device *dev,
         if (rc)
                 return rc;
 
+        rc = -ENXIO;
+
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_contrast) {
                 pr_debug("set contrast to %lu\n", contrast);
diff --git a/drivers/video/backlight/lm3630_bl.c b/drivers/video/backlight/lm3630_bl.c
index 0207bc0a4407..a6d637b5c68f 100644
--- a/drivers/video/backlight/lm3630_bl.c
+++ b/drivers/video/backlight/lm3630_bl.c
@@ -37,7 +37,7 @@ enum lm3630_leds {
         BLED_2
 };
 
-static const char *bled_name[] = {
+static const char * const bled_name[] = {
         [BLED_ALL] = "lm3630_bled",     /*Bank1 controls all string */
         [BLED_1] = "lm3630_bled1",      /*Bank1 controls bled1 */
         [BLED_2] = "lm3630_bled2",      /*Bank1 or 2 controls bled2 */
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
index b0e1e8ba4d9f..7ab2d2a04e41 100644
--- a/drivers/video/backlight/lm3639_bl.c
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -214,7 +214,7 @@ out_input:
 
 }
 
-static DEVICE_ATTR(bled_mode, 0666, NULL, lm3639_bled_mode_store);
+static DEVICE_ATTR(bled_mode, S_IWUSR, NULL, lm3639_bled_mode_store);
 
 /* torch */
 static void lm3639_torch_brightness_set(struct led_classdev *cdev,
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index b29c7071c9db..55819b384701 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -31,7 +31,7 @@ struct lms283gf05_seq {
 };
 
 /* Magic sequences supplied by manufacturer, for details refer to datasheet */
-static struct lms283gf05_seq disp_initseq[] = {
+static const struct lms283gf05_seq disp_initseq[] = {
         /* REG, VALUE, DELAY */
         { 0x07, 0x0000, 0 },
         { 0x13, 0x0000, 10 },
@@ -78,7 +78,7 @@ static struct lms283gf05_seq disp_initseq[] = {
         { 0x22, 0x0000, 0 }
 };
 
-static struct lms283gf05_seq disp_pdwnseq[] = {
+static const struct lms283gf05_seq disp_pdwnseq[] = {
         { 0x07, 0x0016, 30 },
 
         { 0x07, 0x0004, 0 },
@@ -104,7 +104,7 @@ static void lms283gf05_reset(unsigned long gpio, bool inverted)
 }
 
 static void lms283gf05_toggle(struct spi_device *spi,
-                        struct lms283gf05_seq *seq, int sz)
+                                const struct lms283gf05_seq *seq, int sz)
 {
         char buf[3];
         int i;
@@ -158,13 +158,10 @@ static int lms283gf05_probe(struct spi_device *spi)
         int ret = 0;
 
         if (pdata != NULL) {
-                ret = devm_gpio_request(&spi->dev, pdata->reset_gpio,
-                                        "LMS285GF05 RESET");
-                if (ret)
-                        return ret;
-
-                ret = gpio_direction_output(pdata->reset_gpio,
-                                                !pdata->reset_inverted);
+                ret = devm_gpio_request_one(&spi->dev, pdata->reset_gpio,
+                                GPIOF_DIR_OUT | (!pdata->reset_inverted ?
+                                GPIOF_INIT_HIGH : GPIOF_INIT_LOW),
+                                "LMS285GF05 RESET");
                 if (ret)
                         return ret;
         }
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index fd985e0681e9..6e4db0c874c8 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -15,6 +15,7 @@
 #include <linux/backlight.h>
 #include <linux/err.h>
 #include <linux/platform_data/lp855x.h>
+#include <linux/pwm.h>
 
 /* Registers */
 #define BRIGHTNESS_CTRL         0x00
@@ -34,22 +35,19 @@ struct lp855x {
         struct i2c_client *client;
         struct backlight_device *bl;
         struct device *dev;
-        struct mutex xfer_lock;
         struct lp855x_platform_data *pdata;
+        struct pwm_device *pwm;
 };
 
 static int lp855x_read_byte(struct lp855x *lp, u8 reg, u8 *data)
 {
         int ret;
 
-        mutex_lock(&lp->xfer_lock);
         ret = i2c_smbus_read_byte_data(lp->client, reg);
         if (ret < 0) {
-                mutex_unlock(&lp->xfer_lock);
                 dev_err(lp->dev, "failed to read 0x%.2x\n", reg);
                 return ret;
         }
-        mutex_unlock(&lp->xfer_lock);
 
         *data = (u8)ret;
         return 0;
@@ -57,13 +55,7 @@ static int lp855x_read_byte(struct lp855x *lp, u8 reg, u8 *data)
 
 static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data)
 {
-        int ret;
-
-        mutex_lock(&lp->xfer_lock);
-        ret = i2c_smbus_write_byte_data(lp->client, reg, data);
-        mutex_unlock(&lp->xfer_lock);
-
-        return ret;
+        return i2c_smbus_write_byte_data(lp->client, reg, data);
 }
 
 static bool lp855x_is_valid_rom_area(struct lp855x *lp, u8 addr)
@@ -121,6 +113,28 @@ static int lp855x_init_registers(struct lp855x *lp)
         return ret;
 }
 
+static void lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br)
+{
+        unsigned int period = lp->pdata->period_ns;
+        unsigned int duty = br * period / max_br;
+        struct pwm_device *pwm;
+
+        /* request pwm device with the consumer name */
+        if (!lp->pwm) {
+                pwm = devm_pwm_get(lp->dev, lp->chipname);
+                if (IS_ERR(pwm))
+                        return;
+
+                lp->pwm = pwm;
+        }
+
+        pwm_config(lp->pwm, duty, period);
+        if (duty)
+                pwm_enable(lp->pwm);
+        else
+                pwm_disable(lp->pwm);
+}
+
 static int lp855x_bl_update_status(struct backlight_device *bl)
 {
         struct lp855x *lp = bl_get_data(bl);
@@ -130,12 +144,10 @@ static int lp855x_bl_update_status(struct backlight_device *bl)
                 bl->props.brightness = 0;
 
         if (mode == PWM_BASED) {
-                struct lp855x_pwm_data *pd = &lp->pdata->pwm_data;
                 int br = bl->props.brightness;
                 int max_br = bl->props.max_brightness;
 
-                if (pd->pwm_set_intensity)
-                        pd->pwm_set_intensity(br, max_br);
+                lp855x_pwm_ctrl(lp, br, max_br);
 
         } else if (mode == REGISTER_BASED) {
                 u8 val = bl->props.brightness;
@@ -150,14 +162,7 @@ static int lp855x_bl_get_brightness(struct backlight_device *bl)
         struct lp855x *lp = bl_get_data(bl);
         enum lp855x_brightness_ctrl_mode mode = lp->pdata->mode;
 
-        if (mode == PWM_BASED) {
-                struct lp855x_pwm_data *pd = &lp->pdata->pwm_data;
-                int max_br = bl->props.max_brightness;
-
-                if (pd->pwm_get_intensity)
-                        bl->props.brightness = pd->pwm_get_intensity(max_br);
-
-        } else if (mode == REGISTER_BASED) {
+        if (mode == REGISTER_BASED) {
                 u8 val = 0;
 
                 lp855x_read_byte(lp, BRIGHTNESS_CTRL, &val);
@@ -266,8 +271,6 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
         lp->chip_id = id->driver_data;
         i2c_set_clientdata(cl, lp);
 
-        mutex_init(&lp->xfer_lock);
-
         ret = lp855x_init_registers(lp);
         if (ret) {
                 dev_err(lp->dev, "i2c communication err: %d", ret);
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index c6bec7aab87b..2c9bce050aa9 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -120,15 +120,13 @@ static int max8925_backlight_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for mode control!\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_mode_cntl = res->start;
         res = platform_get_resource(pdev, IORESOURCE_REG, 1);
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for control!\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_cntl = res->start;
 
@@ -142,8 +140,7 @@ static int max8925_backlight_probe(struct platform_device *pdev)
                                         &max8925_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                ret = PTR_ERR(bl);
-                goto out;
+                return PTR_ERR(bl);
         }
         bl->props.brightness = MAX_BRIGHTNESS;
 
@@ -166,8 +163,6 @@ static int max8925_backlight_probe(struct platform_device *pdev)
         return 0;
 out_brt:
         backlight_device_unregister(bl);
-out:
-        devm_kfree(&pdev->dev, data);
         return ret;
 }
 
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 9a046a4c98f5..af31c269baa6 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -42,12 +42,12 @@ struct omap_backlight {
         struct omap_backlight_config *pdata;
 };
 
-static void inline omapbl_send_intensity(int intensity)
+static inline void omapbl_send_intensity(int intensity)
 {
         omap_writeb(intensity, OMAP_PWL_ENABLE);
 }
 
-static void inline omapbl_send_enable(int enable)
+static inline void omapbl_send_enable(int enable)
 {
         omap_writeb(enable, OMAP_PWL_CLK_ENABLE);
 }
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 4ec30748b447..633b0a22fd64 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -71,8 +71,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
                  * set PWM duty cycle to max. TPS61161 seems to use this
                  * to calibrate it's PWM sensitivity when it starts.
                  */
-                twl_i2c_write_u8(TWL4030_MODULE_PWM0, MAX_VALUE,
-                                        TWL_PWM0_OFF);
+                twl_i2c_write_u8(TWL_MODULE_PWM, MAX_VALUE, TWL_PWM0_OFF);
 
                 /* first enable clock, then PWM0 out */
                 twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1);
@@ -90,8 +89,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
                 usleep_range(2000, 10000);
         }
 
-        twl_i2c_write_u8(TWL4030_MODULE_PWM0, MIN_VALUE + brightness,
-                                TWL_PWM0_OFF);
+        twl_i2c_write_u8(TWL_MODULE_PWM, MIN_VALUE + brightness, TWL_PWM0_OFF);
 
 done:
         if (brightness != 0)
@@ -132,7 +130,7 @@ static int pandora_backlight_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, bl);
 
         /* 64 cycle period, ON position 0 */
-        twl_i2c_write_u8(TWL4030_MODULE_PWM0, 0x80, TWL_PWM0_ON);
+        twl_i2c_write_u8(TWL_MODULE_PWM, 0x80, TWL_PWM0_ON);
 
         bl->props.state |= PANDORABL_WAS_OFF;
         bl->props.brightness = MAX_USER_VALUE;
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index 0087396007e4..e87c7a3394f3 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -52,7 +52,7 @@ int pcf50633_bl_set_brightness_limit(struct pcf50633 *pcf, unsigned int limit)
         pcf_bl->brightness_limit = limit & 0x3f;
         backlight_update_status(pcf_bl->bl);
 
-    return 0;
+        return 0;
 }
 
 static int pcf50633_bl_update_status(struct backlight_device *bl)
@@ -136,8 +136,10 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
 
         pcf50633_reg_write(pcf_bl->pcf, PCF50633_REG_LEDDIM, pdata->ramp_time);
 
-        /* Should be different from bl_props.brightness, so we do not exit
-         * update_status early the first time it's called */
+        /*
+         * Should be different from bl_props.brightness, so we do not exit
+         * update_status early the first time it's called
+         */
         pcf_bl->brightness = pcf_bl->bl->props.brightness + 1;
 
         backlight_update_status(pcf_bl->bl);
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index 894bfc5ce422..17a6b83f97af 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -27,7 +27,7 @@ struct platform_lcd {
         struct plat_lcd_data    *pdata;
 
         unsigned int             power;
-        unsigned int             suspended : 1;
+        unsigned int             suspended:1;
 };
 
 static inline struct platform_lcd *to_our_lcd(struct lcd_device *lcd)
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index 484e10dd1a8e..3e1c1135f6df 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -757,7 +757,7 @@ static int s6e63m0_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = (struct lcd_platform_data *)spi->dev.platform_data;
+        lcd->lcd_pd = spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
                 return -EFAULT;
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 146ffb9404d1..ad2325f3d652 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -2,7 +2,7 @@
  * tdo24m - SPI-based drivers for Toppoly TDO24M series LCD panels
  *
  * Copyright (C) 2008 Marvell International Ltd.
- *      Eric Miao <eric.miao@marvell.com>
+ *      Eric Miao <eric.miao@marvell.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -47,7 +47,7 @@ struct tdo24m {
                         ((x1) << 9) | 0x100 | (x2))
 #define CMD_NULL        (-1)
 
-static uint32_t lcd_panel_reset[] = {
+static const uint32_t lcd_panel_reset[] = {
         CMD0(0x1), /* reset */
         CMD0(0x0), /* nop */
         CMD0(0x0), /* nop */
@@ -55,7 +55,7 @@ static uint32_t lcd_panel_reset[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_panel_on[] = {
+static const uint32_t lcd_panel_on[] = {
         CMD0(0x29),             /* Display ON */
         CMD2(0xB8, 0xFF, 0xF9), /* Output Control */
         CMD0(0x11),             /* Sleep out */
@@ -63,7 +63,7 @@ static uint32_t lcd_panel_on[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_panel_off[] = {
+static const uint32_t lcd_panel_off[] = {
         CMD0(0x28),             /* Display OFF */
         CMD2(0xB8, 0x80, 0x02), /* Output Control */
         CMD0(0x10),             /* Sleep in */
@@ -71,7 +71,7 @@ static uint32_t lcd_panel_off[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_vga_pass_through_tdo24m[] = {
+static const uint32_t lcd_vga_pass_through_tdo24m[] = {
         CMD1(0xB0, 0x16),
         CMD1(0xBC, 0x80),
         CMD1(0xE1, 0x00),
@@ -80,7 +80,7 @@ static uint32_t lcd_vga_pass_through_tdo24m[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_qvga_pass_through_tdo24m[] = {
+static const uint32_t lcd_qvga_pass_through_tdo24m[] = {
         CMD1(0xB0, 0x16),
         CMD1(0xBC, 0x81),
         CMD1(0xE1, 0x00),
@@ -89,8 +89,8 @@ static uint32_t lcd_qvga_pass_through_tdo24m[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_vga_transfer_tdo24m[] = {
-        CMD1(0xcf, 0x02),       /* Blanking period control (1) */
+static const uint32_t lcd_vga_transfer_tdo24m[] = {
+        CMD1(0xcf, 0x02),       /* Blanking period control (1) */
         CMD2(0xd0, 0x08, 0x04), /* Blanking period control (2) */
         CMD1(0xd1, 0x01),       /* CKV timing control on/off */
         CMD2(0xd2, 0x14, 0x00), /* CKV 1,2 timing control */
@@ -102,7 +102,7 @@ static uint32_t lcd_vga_transfer_tdo24m[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_qvga_transfer[] = {
+static const uint32_t lcd_qvga_transfer[] = {
         CMD1(0xd6, 0x02),       /* Blanking period control (1) */
         CMD2(0xd7, 0x08, 0x04), /* Blanking period control (2) */
         CMD1(0xd8, 0x01),       /* CKV timing control on/off */
@@ -115,7 +115,7 @@ static uint32_t lcd_qvga_transfer[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_vga_pass_through_tdo35s[] = {
+static const uint32_t lcd_vga_pass_through_tdo35s[] = {
         CMD1(0xB0, 0x16),
         CMD1(0xBC, 0x80),
         CMD1(0xE1, 0x00),
@@ -123,7 +123,7 @@ static uint32_t lcd_vga_pass_through_tdo35s[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_qvga_pass_through_tdo35s[] = {
+static const uint32_t lcd_qvga_pass_through_tdo35s[] = {
         CMD1(0xB0, 0x16),
         CMD1(0xBC, 0x81),
         CMD1(0xE1, 0x00),
@@ -131,8 +131,8 @@ static uint32_t lcd_qvga_pass_through_tdo35s[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_vga_transfer_tdo35s[] = {
-        CMD1(0xcf, 0x02),       /* Blanking period control (1) */
+static const uint32_t lcd_vga_transfer_tdo35s[] = {
+        CMD1(0xcf, 0x02),       /* Blanking period control (1) */
         CMD2(0xd0, 0x08, 0x04), /* Blanking period control (2) */
         CMD1(0xd1, 0x01),       /* CKV timing control on/off */
         CMD2(0xd2, 0x00, 0x1e), /* CKV 1,2 timing control */
@@ -144,7 +144,7 @@ static uint32_t lcd_vga_transfer_tdo35s[] = {
         CMD_NULL,
 };
 
-static uint32_t lcd_panel_config[] = {
+static const uint32_t lcd_panel_config[] = {
         CMD2(0xb8, 0xff, 0xf9), /* Output control */
         CMD0(0x11),             /* sleep out */
         CMD1(0xba, 0x01),       /* Display mode (1) */
@@ -175,10 +175,11 @@ static uint32_t lcd_panel_config[] = {
         CMD_NULL,
 };
 
-static int tdo24m_writes(struct tdo24m *lcd, uint32_t *array)
+static int tdo24m_writes(struct tdo24m *lcd, const uint32_t *array)
 {
         struct spi_transfer *x = &lcd->xfer;
-        uint32_t data, *p = array;
+        const uint32_t *p = array;
+        uint32_t data;
         int nparams, err = 0;
 
         for (; *p != CMD_NULL; p++) {
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index a0521abdcd8a..588682cc1614 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -92,14 +92,12 @@ static int tosa_bl_probe(struct i2c_client *client,
 
         data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
 
-        ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight");
+        ret = devm_gpio_request_one(&client->dev, TOSA_GPIO_BL_C20MA,
+                                GPIOF_OUT_INIT_LOW, "backlight");
         if (ret) {
                 dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
                 return ret;
         }
-        ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
-        if (ret)
-                return ret;
 
         i2c_set_clientdata(client, data);
         data->i2c = client;
@@ -163,7 +161,6 @@ static const struct i2c_device_id tosa_bl_id[] = {
         { },
 };
 
-
 static struct i2c_driver tosa_bl_driver = {
         .driver = {
                 .name           = "tosa-bl",
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 86fff88c2e4a..96bae941585a 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -63,7 +63,7 @@ static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data)
 int tosa_bl_enable(struct spi_device *spi, int enable)
 {
         /* bl_enable GP04=1 otherwise GP04=0*/
-        return tosa_tg_send(spi, TG_GPODR2, enable? 0x01 : 0x00);
+        return tosa_tg_send(spi, TG_GPODR2, enable ? 0x01 : 0x00);
 }
 EXPORT_SYMBOL(tosa_bl_enable);
 
@@ -91,15 +91,17 @@ static void tosa_lcd_tg_on(struct tosa_lcd_data *data)
         tosa_tg_send(spi, TG_PNLCTL, value);
 
         /* TG LCD pannel power up */
-        tosa_tg_send(spi, TG_PINICTL,0x4);
+        tosa_tg_send(spi, TG_PINICTL, 0x4);
         mdelay(50);
 
         /* TG LCD GVSS */
-        tosa_tg_send(spi, TG_PINICTL,0x0);
+        tosa_tg_send(spi, TG_PINICTL, 0x0);
 
         if (!data->i2c) {
-                /* after the pannel is powered up the first time, we can access the i2c bus */
-                /* so probe for the DAC */
+                /*
+                 * after the pannel is powered up the first time,
+                 * we can access the i2c bus so probe for the DAC
+                 */
                 struct i2c_adapter *adap = i2c_get_adapter(0);
                 struct i2c_board_info info = {
                         .type   = "tosa-bl",
@@ -115,11 +117,11 @@ static void tosa_lcd_tg_off(struct tosa_lcd_data *data)
         struct spi_device *spi = data->spi;
 
         /* TG LCD VHSA off */
-        tosa_tg_send(spi, TG_PINICTL,0x4);
+        tosa_tg_send(spi, TG_PINICTL, 0x4);
         mdelay(50);
 
         /* TG LCD signal off */
-        tosa_tg_send(spi, TG_PINICTL,0x6);
+        tosa_tg_send(spi, TG_PINICTL, 0x6);
         mdelay(50);
 
         /* TG Off */
@@ -193,17 +195,13 @@ static int tosa_lcd_probe(struct spi_device *spi)
         data->spi = spi;
         dev_set_drvdata(&spi->dev, data);
 
-        ret = devm_gpio_request(&spi->dev, TOSA_GPIO_TG_ON, "tg #pwr");
+        ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
+                                GPIOF_OUT_INIT_LOW, "tg #pwr");
         if (ret < 0)
                 goto err_gpio_tg;
 
         mdelay(60);
 
-        ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
-        if (ret < 0)
-                goto err_gpio_tg;
-
-        mdelay(60);
         tosa_lcd_tg_init(data);
 
         tosa_lcd_tg_on(data);
diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c
index 712b0acfd339..45e81b4cf8b4 100644
--- a/drivers/video/backlight/vgg2432a4.c
+++ b/drivers/video/backlight/vgg2432a4.c
@@ -26,7 +26,7 @@
 
 /* Device initialisation sequences */
 
-static struct ili9320_reg vgg_init1[] = {
+static const struct ili9320_reg vgg_init1[] = {
         {
                 .address = ILI9320_POWER1,
                 .value   = ILI9320_POWER1_AP(0) | ILI9320_POWER1_BT(0),
@@ -43,7 +43,7 @@ static struct ili9320_reg vgg_init1[] = {
         },
 };
 
-static struct ili9320_reg vgg_init2[] = {
+static const struct ili9320_reg vgg_init2[] = {
         {
                 .address = ILI9320_POWER1,
                 .value   = (ILI9320_POWER1_AP(3) | ILI9320_POWER1_APE |
@@ -54,7 +54,7 @@ static struct ili9320_reg vgg_init2[] = {
         }
 };
 
-static struct ili9320_reg vgg_gamma[] = {
+static const struct ili9320_reg vgg_gamma[] = {
         {
                 .address = ILI9320_GAMMA1,
                 .value   = 0x0000,
@@ -89,7 +89,7 @@ static struct ili9320_reg vgg_gamma[] = {
 
 };
 
-static struct ili9320_reg vgg_init0[] = {
+static const struct ili9320_reg vgg_init0[] = {
         [0]     = {
                 /* set direction and scan mode gate */
                 .address = ILI9320_DRIVER,
@@ -217,7 +217,7 @@ static int vgg2432a4_resume(struct spi_device *spi)
 }
 #else
 #define vgg2432a4_suspend       NULL
-#define vgg2432a4_resume        NULL
+#define vgg2432a4_resume        NULL
 #endif
 
 static struct ili9320_client vgg2432a4_client = {