47 files changed, 721 insertions, 938 deletions

diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 7e8346ec9cdc..a305caea58ee 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -949,9 +949,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
                  * the page.
                  */
                 page = virt_to_page(virtual_start);
-                ClearPageReserved(page);
-                init_page_count(page);
-                free_page(virtual_start);
+                __free_reserved_page(page);
 
                 virtual_start += PAGE_SIZE;
                 mb_freed += PAGE_SIZE / 1024;
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 2cd63507ed74..7db5234462d0 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -196,7 +196,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev,
 static int pm860x_backlight_probe(struct platform_device *pdev)
 {
         struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-        struct pm860x_backlight_pdata *pdata = pdev->dev.platform_data;
+        struct pm860x_backlight_pdata *pdata = dev_get_platdata(&pdev->dev);
         struct pm860x_backlight_data *data;
         struct backlight_device *bl;
         struct resource *res;
@@ -243,7 +243,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
-        bl = backlight_device_register(name, &pdev->dev, data,
+        bl = devm_backlight_device_register(&pdev->dev, name, &pdev->dev, data,
                                         &pm860x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
@@ -256,21 +256,10 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         /* read current backlight */
         ret = pm860x_backlight_get_brightness(bl);
         if (ret < 0)
-                goto out_brt;
+                return ret;
 
         backlight_update_status(bl);
         return 0;
-out_brt:
-        backlight_device_unregister(bl);
-        return ret;
-}
-
-static int pm860x_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bl);
-        return 0;
 }
 
 static struct platform_driver pm860x_backlight_driver = {
@@ -279,7 +268,6 @@ static struct platform_driver pm860x_backlight_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = pm860x_backlight_probe,
-        .remove         = pm860x_backlight_remove,
 };
 
 module_platform_driver(pm860x_backlight_driver);
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index d4a7a351d67c..5a3eb2ecb525 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -368,12 +368,12 @@ config BACKLIGHT_AAT2870
           If you have a AnalogicTech AAT2870 say Y to enable the
           backlight driver.
 
-config BACKLIGHT_LM3630
-        tristate "Backlight Driver for LM3630"
+config BACKLIGHT_LM3630A
+        tristate "Backlight Driver for LM3630A"
         depends on BACKLIGHT_CLASS_DEVICE && I2C
         select REGMAP_I2C
         help
-          This supports TI LM3630 Backlight Driver
+          This supports TI LM3630A Backlight Driver
 
 config BACKLIGHT_LM3639
         tristate "Backlight Driver for LM3639"
@@ -388,8 +388,8 @@ config BACKLIGHT_LP855X
         tristate "Backlight driver for TI LP855X"
         depends on BACKLIGHT_CLASS_DEVICE && I2C
         help
-          This supports TI LP8550, LP8551, LP8552, LP8553, LP8556 and LP8557
-          backlight driver.
+          This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
+          LP8557 backlight driver.
 
 config BACKLIGHT_LP8788
         tristate "Backlight driver for TI LP8788 MFD"
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 38e1babb1946..bb820024f346 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_BACKLIGHT_GPIO)		+= gpio_backlight.o
 obj-$(CONFIG_BACKLIGHT_HP680)           += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)           += jornada720_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3533)          += lm3533_bl.o
-obj-$(CONFIG_BACKLIGHT_LM3630)          += lm3630_bl.o
+obj-$(CONFIG_BACKLIGHT_LM3630A)         += lm3630a_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3639)          += lm3639_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)          += locomolcd.o
 obj-$(CONFIG_BACKLIGHT_LP855X)          += lp855x_bl.o
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index c6fc668d6236..ee0c0a982e4e 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -127,7 +127,7 @@ static const struct backlight_ops aat2870_bl_ops = {
 
 static int aat2870_bl_probe(struct platform_device *pdev)
 {
-        struct aat2870_bl_platform_data *pdata = pdev->dev.platform_data;
+        struct aat2870_bl_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct aat2870_bl_driver_data *aat2870_bl;
         struct backlight_device *bd;
         struct backlight_properties props;
@@ -158,8 +158,9 @@ static int aat2870_bl_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
 
         props.type = BACKLIGHT_RAW;
-        bd = backlight_device_register("aat2870-backlight", &pdev->dev,
-                                       aat2870_bl, &aat2870_bl_ops, &props);
+        bd = devm_backlight_device_register(&pdev->dev, "aat2870-backlight",
+                                        &pdev->dev, aat2870_bl, &aat2870_bl_ops,
+                                        &props);
         if (IS_ERR(bd)) {
                 dev_err(&pdev->dev,
                         "Failed allocate memory for backlight device\n");
@@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platform_device *pdev)
         ret = aat2870_bl_update_status(bd);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to initialize\n");
-                goto out_bl_dev_unregister;
+                return ret;
         }
 
         return 0;
 
-out_bl_dev_unregister:
-        backlight_device_unregister(bd);
 out:
         return ret;
 }
@@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
         bd->props.brightness = 0;
         backlight_update_status(bd);
 
-        backlight_device_unregister(bd);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index c84701b7ca6e..f37097a261a2 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -297,7 +297,7 @@ static int adp5520_bl_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         data->master = pdev->dev.parent;
-        data->pdata = pdev->dev.platform_data;
+        data->pdata = dev_get_platdata(&pdev->dev);
 
         if (data->pdata  == NULL) {
                 dev_err(&pdev->dev, "missing platform data\n");
@@ -312,8 +312,9 @@ static int adp5520_bl_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = ADP5020_MAX_BRIGHTNESS;
-        bl = backlight_device_register(pdev->name, data->master, data,
-                                       &adp5520_bl_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+                                        data->master, data, &adp5520_bl_ops,
+                                        &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -326,7 +327,7 @@ static int adp5520_bl_probe(struct platform_device *pdev)
 
         if (ret) {
                 dev_err(&pdev->dev, "failed to register sysfs\n");
-                backlight_device_unregister(bl);
+                return ret;
         }
 
         platform_set_drvdata(pdev, bl);
@@ -347,8 +348,6 @@ static int adp5520_bl_remove(struct platform_device *pdev)
                 sysfs_remove_group(&bl->dev.kobj,
                                 &adp5520_bl_attr_group);
 
-        backlight_device_unregister(bl);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 75b10f876127..9d656717d0f7 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -216,7 +216,7 @@ static int adp8860_led_setup(struct adp8860_led *led)
 static int adp8860_led_probe(struct i2c_client *client)
 {
         struct adp8860_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         struct adp8860_bl *data = i2c_get_clientdata(client);
         struct adp8860_led *led, *led_dat;
         struct led_info *cur_led;
@@ -300,7 +300,7 @@ static int adp8860_led_probe(struct i2c_client *client)
 static int adp8860_led_remove(struct i2c_client *client)
 {
         struct adp8860_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         struct adp8860_bl *data = i2c_get_clientdata(client);
         int i;
 
@@ -658,7 +658,7 @@ static int adp8860_probe(struct i2c_client *client,
         struct backlight_device *bl;
         struct adp8860_bl *data;
         struct adp8860_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         struct backlight_properties props;
         uint8_t reg_val;
         int ret;
@@ -711,8 +711,9 @@ static int adp8860_probe(struct i2c_client *client,
 
         mutex_init(&data->lock);
 
-        bl = backlight_device_register(dev_driver_string(&client->dev),
-                        &client->dev, data, &adp8860_bl_ops, &props);
+        bl = devm_backlight_device_register(&client->dev,
+                                dev_driver_string(&client->dev),
+                                &client->dev, data, &adp8860_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -728,7 +729,7 @@ static int adp8860_probe(struct i2c_client *client,
 
         if (ret) {
                 dev_err(&client->dev, "failed to register sysfs\n");
-                goto out1;
+                return ret;
         }
 
         ret = adp8860_bl_setup(bl);
@@ -751,8 +752,6 @@ out:
         if (data->en_ambl_sens)
                 sysfs_remove_group(&data->bl->dev.kobj,
                         &adp8860_bl_attr_group);
-out1:
-        backlight_device_unregister(bl);
 
         return ret;
 }
@@ -770,8 +769,6 @@ static int adp8860_remove(struct i2c_client *client)
                 sysfs_remove_group(&data->bl->dev.kobj,
                         &adp8860_bl_attr_group);
 
-        backlight_device_unregister(data->bl);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 90049d7b5c60..63707205326b 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -238,7 +238,7 @@ static int adp8870_led_setup(struct adp8870_led *led)
 static int adp8870_led_probe(struct i2c_client *client)
 {
         struct adp8870_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         struct adp8870_bl *data = i2c_get_clientdata(client);
         struct adp8870_led *led, *led_dat;
         struct led_info *cur_led;
@@ -325,7 +325,7 @@ static int adp8870_led_probe(struct i2c_client *client)
 static int adp8870_led_remove(struct i2c_client *client)
 {
         struct adp8870_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         struct adp8870_bl *data = i2c_get_clientdata(client);
         int i;
 
@@ -848,7 +848,7 @@ static int adp8870_probe(struct i2c_client *client,
         struct backlight_device *bl;
         struct adp8870_bl *data;
         struct adp8870_backlight_platform_data *pdata =
-                client->dev.platform_data;
+                dev_get_platdata(&client->dev);
         uint8_t reg_val;
         int ret;
 
@@ -888,8 +888,9 @@ static int adp8870_probe(struct i2c_client *client,
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = props.brightness = ADP8870_MAX_BRIGHTNESS;
-        bl = backlight_device_register(dev_driver_string(&client->dev),
-                        &client->dev, data, &adp8870_bl_ops, &props);
+        bl = devm_backlight_device_register(&client->dev,
+                                dev_driver_string(&client->dev),
+                                &client->dev, data, &adp8870_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -902,7 +903,7 @@ static int adp8870_probe(struct i2c_client *client,
                         &adp8870_bl_attr_group);
                 if (ret) {
                         dev_err(&client->dev, "failed to register sysfs\n");
-                        goto out1;
+                        return ret;
                 }
         }
 
@@ -925,8 +926,6 @@ out:
         if (data->pdata->en_ambl_sens)
                 sysfs_remove_group(&data->bl->dev.kobj,
                         &adp8870_bl_attr_group);
-out1:
-        backlight_device_unregister(bl);
 
         return ret;
 }
@@ -944,8 +943,6 @@ static int adp8870_remove(struct i2c_client *client)
                 sysfs_remove_group(&data->bl->dev.kobj,
                         &adp8870_bl_attr_group);
 
-        backlight_device_unregister(data->bl);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 319fef6cb422..d8952c4aa689 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -471,14 +471,14 @@ static int ams369fg06_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = spi->dev.platform_data;
+        lcd->lcd_pd = dev_get_platdata(&spi->dev);
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL\n");
                 return -EINVAL;
         }
 
-        ld = lcd_device_register("ams369fg06", &spi->dev, lcd,
-                &ams369fg06_lcd_ops);
+        ld = devm_lcd_device_register(&spi->dev, "ams369fg06", &spi->dev, lcd,
+                                        &ams369fg06_lcd_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -488,12 +488,11 @@ static int ams369fg06_probe(struct spi_device *spi)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
 
-        bd = backlight_device_register("ams369fg06-bl", &spi->dev, lcd,
-                &ams369fg06_backlight_ops, &props);
-        if (IS_ERR(bd)) {
-                ret =  PTR_ERR(bd);
-                goto out_lcd_unregister;
-        }
+        bd = devm_backlight_device_register(&spi->dev, "ams369fg06-bl",
+                                        &spi->dev, lcd,
+                                        &ams369fg06_backlight_ops, &props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
 
         bd->props.brightness = DEFAULT_BRIGHTNESS;
         lcd->bd = bd;
@@ -516,10 +515,6 @@ static int ams369fg06_probe(struct spi_device *spi)
         dev_info(&spi->dev, "ams369fg06 panel driver has been probed.\n");
 
         return 0;
-
-out_lcd_unregister:
-        lcd_device_unregister(ld);
-        return ret;
 }
 
 static int ams369fg06_remove(struct spi_device *spi)
@@ -527,9 +522,6 @@ static int ams369fg06_remove(struct spi_device *spi)
         struct ams369fg06 *lcd = spi_get_drvdata(spi);
 
         ams369fg06_power(lcd, FB_BLANK_POWERDOWN);
-        backlight_device_unregister(lcd->bd);
-        lcd_device_unregister(lcd->ld);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/as3711_bl.c b/drivers/video/backlight/as3711_bl.c
index 123887cd76bd..bb1fc45b7549 100644
--- a/drivers/video/backlight/as3711_bl.c
+++ b/drivers/video/backlight/as3711_bl.c
@@ -240,7 +240,8 @@ static int as3711_bl_register(struct platform_device *pdev,
         /* max tuning I = 31uA for voltage- and 38250uA for current-feedback */
         props.max_brightness = max_brightness;
 
-        bl = backlight_device_register(su->type == AS3711_BL_SU1 ?
+        bl = devm_backlight_device_register(&pdev->dev,
+                                       su->type == AS3711_BL_SU1 ?
                                        "as3711-su1" : "as3711-su2",
                                        &pdev->dev, su,
                                        &as3711_bl_ops, &props);
@@ -432,8 +433,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
                 case AS3711_SU2_LX_SD4:
                         break;
                 default:
-                        ret = -EINVAL;
-                        goto esu2;
+                        return -EINVAL;
                 }
 
                 switch (pdata->su2_feedback) {
@@ -447,8 +447,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
                         max_brightness = min(pdata->su2_max_uA / 150, 255);
                         break;
                 default:
-                        ret = -EINVAL;
-                        goto esu2;
+                        return -EINVAL;
                 }
 
                 ret = as3711_bl_init_su2(supply);
@@ -457,26 +456,12 @@ static int as3711_backlight_probe(struct platform_device *pdev)
 
                 ret = as3711_bl_register(pdev, max_brightness, su);
                 if (ret < 0)
-                        goto esu2;
+                        return ret;
         }
 
         platform_set_drvdata(pdev, supply);
 
         return 0;
-
-esu2:
-        backlight_device_unregister(supply->su1.bl);
-        return ret;
-}
-
-static int as3711_backlight_remove(struct platform_device *pdev)
-{
-        struct as3711_bl_supply *supply = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(supply->su1.bl);
-        backlight_device_unregister(supply->su2.bl);
-
-        return 0;
 }
 
 static struct platform_driver as3711_backlight_driver = {
@@ -485,7 +470,6 @@ static struct platform_driver as3711_backlight_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = as3711_backlight_probe,
-        .remove         = as3711_backlight_remove,
 };
 
 module_platform_driver(as3711_backlight_driver);
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index f7447f7004fb..261b1a4ec3d8 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
-#include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/backlight.h>
 #include <linux/atmel_pwm.h>
@@ -27,6 +26,14 @@ struct atmel_pwm_bl {
         int                                     gpio_on;
 };
 
+static void atmel_pwm_bl_set_gpio_on(struct atmel_pwm_bl *pwmbl, int on)
+{
+        if (!gpio_is_valid(pwmbl->gpio_on))
+                return;
+
+        gpio_set_value(pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low);
+}
+
 static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)
 {
         struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
@@ -49,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)
                 pwm_duty = pwmbl->pdata->pwm_duty_min;
 
         if (!intensity) {
-                if (pwmbl->gpio_on != -1) {
-                        gpio_set_value(pwmbl->gpio_on,
-                                        0 ^ pwmbl->pdata->on_active_low);
-                }
+                atmel_pwm_bl_set_gpio_on(pwmbl, 0);
                 pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);
                 pwm_channel_disable(&pwmbl->pwmc);
         } else {
                 pwm_channel_enable(&pwmbl->pwmc);
                 pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);
-                if (pwmbl->gpio_on != -1) {
-                        gpio_set_value(pwmbl->gpio_on,
-                                        1 ^ pwmbl->pdata->on_active_low);
-                }
+                atmel_pwm_bl_set_gpio_on(pwmbl, 1);
         }
 
         return 0;
@@ -70,17 +71,16 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)
 static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)
 {
         struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
-        u8 intensity;
+        u32 cdty;
+        u32 intensity;
 
-        if (pwmbl->pdata->pwm_active_low) {
-                intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
-                        pwmbl->pdata->pwm_duty_min;
-        } else {
-                intensity = pwmbl->pdata->pwm_duty_max -
-                        pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY);
-        }
+        cdty = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY);
+        if (pwmbl->pdata->pwm_active_low)
+                intensity = cdty - pwmbl->pdata->pwm_duty_min;
+        else
+                intensity = pwmbl->pdata->pwm_duty_max - cdty;
 
-        return intensity;
+        return intensity & 0xffff;
 }
 
 static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
@@ -124,46 +124,40 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
         const struct atmel_pwm_bl_platform_data *pdata;
         struct backlight_device *bldev;
         struct atmel_pwm_bl *pwmbl;
+        unsigned long flags;
         int retval;
 
+        pdata = dev_get_platdata(&pdev->dev);
+        if (!pdata)
+                return -ENODEV;
+
+        if (pdata->pwm_compare_max < pdata->pwm_duty_max ||
+                        pdata->pwm_duty_min > pdata->pwm_duty_max ||
+                        pdata->pwm_frequency == 0)
+                return -EINVAL;
+
         pwmbl = devm_kzalloc(&pdev->dev, sizeof(struct atmel_pwm_bl),
                                 GFP_KERNEL);
         if (!pwmbl)
                 return -ENOMEM;
 
         pwmbl->pdev = pdev;
-
-        pdata = pdev->dev.platform_data;
-        if (!pdata) {
-                retval = -ENODEV;
-                goto err_free_mem;
-        }
-
-        if (pdata->pwm_compare_max < pdata->pwm_duty_max ||
-                        pdata->pwm_duty_min > pdata->pwm_duty_max ||
-                        pdata->pwm_frequency == 0) {
-                retval = -EINVAL;
-                goto err_free_mem;
-        }
-
         pwmbl->pdata = pdata;
         pwmbl->gpio_on = pdata->gpio_on;
 
         retval = pwm_channel_alloc(pdata->pwm_channel, &pwmbl->pwmc);
         if (retval)
-                goto err_free_mem;
-
-        if (pwmbl->gpio_on != -1) {
-                retval = devm_gpio_request(&pdev->dev, pwmbl->gpio_on,
-                                        "gpio_atmel_pwm_bl");
-                if (retval) {
-                        pwmbl->gpio_on = -1;
-                        goto err_free_pwm;
-                }
+                return retval;
 
+        if (gpio_is_valid(pwmbl->gpio_on)) {
                 /* Turn display off by default. */
-                retval = gpio_direction_output(pwmbl->gpio_on,
-                                0 ^ pdata->on_active_low);
+                if (pdata->on_active_low)
+                        flags = GPIOF_OUT_INIT_HIGH;
+                else
+                        flags = GPIOF_OUT_INIT_LOW;
+
+                retval = devm_gpio_request_one(&pdev->dev, pwmbl->gpio_on,
+                                                flags, "gpio_atmel_pwm_bl");
                 if (retval)
                         goto err_free_pwm;
         }
@@ -171,8 +165,9 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;
-        bldev = backlight_device_register("atmel-pwm-bl", &pdev->dev, pwmbl,
-                                          &atmel_pwm_bl_ops, &props);
+        bldev = devm_backlight_device_register(&pdev->dev, "atmel-pwm-bl",
+                                        &pdev->dev, pwmbl, &atmel_pwm_bl_ops,
+                                        &props);
         if (IS_ERR(bldev)) {
                 retval = PTR_ERR(bldev);
                 goto err_free_pwm;
@@ -188,17 +183,15 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
 
         retval = atmel_pwm_bl_init_pwm(pwmbl);
         if (retval)
-                goto err_free_bl_dev;
+                goto err_free_pwm;
 
         atmel_pwm_bl_set_intensity(bldev);
 
         return 0;
 
-err_free_bl_dev:
-        backlight_device_unregister(bldev);
 err_free_pwm:
         pwm_channel_free(&pwmbl->pwmc);
-err_free_mem:
+
         return retval;
 }
 
@@ -206,11 +199,9 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev)
 {
         struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);
 
-        if (pwmbl->gpio_on != -1)
-                gpio_set_value(pwmbl->gpio_on, 0);
+        atmel_pwm_bl_set_gpio_on(pwmbl, 0);
         pwm_channel_disable(&pwmbl->pwmc);
         pwm_channel_free(&pwmbl->pwmc);
-        backlight_device_unregister(pwmbl->bldev);
 
         return 0;
 }
@@ -229,3 +220,4 @@ module_platform_driver(atmel_pwm_bl_driver);
 MODULE_AUTHOR("Hans-Christian egtvedt <hans-christian.egtvedt@atmel.com>");
 MODULE_DESCRIPTION("Atmel PWM backlight driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:atmel-pwm-bl");
diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c
index 15e3294b29fe..16dd9bc625bd 100644
--- a/drivers/video/backlight/bd6107.c
+++ b/drivers/video/backlight/bd6107.c
@@ -128,7 +128,7 @@ static const struct backlight_ops bd6107_backlight_ops = {
 static int bd6107_probe(struct i2c_client *client,
                           const struct i2c_device_id *id)
 {
-        struct bd6107_platform_data *pdata = client->dev.platform_data;
+        struct bd6107_platform_data *pdata = dev_get_platdata(&client->dev);
         struct backlight_device *backlight;
         struct backlight_properties props;
         struct bd6107 *bd;
@@ -166,7 +166,8 @@ static int bd6107_probe(struct i2c_client *client,
         props.brightness = clamp_t(unsigned int, pdata->def_value, 0,
                                    props.max_brightness);
 
-        backlight = backlight_device_register(dev_name(&client->dev),
+        backlight = devm_backlight_device_register(&client->dev,
+                                              dev_name(&client->dev),
                                               &bd->client->dev, bd,
                                               &bd6107_backlight_ops, &props);
         if (IS_ERR(backlight)) {
@@ -186,7 +187,6 @@ static int bd6107_remove(struct i2c_client *client)
 
         backlight->props.brightness = 0;
         backlight_update_status(backlight);
-        backlight_device_unregister(backlight);
 
         return 0;
 }
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index c97867a717a7..db8db5fa6583 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -533,7 +533,7 @@ static int setup_gpio_backlight(struct corgi_lcd *lcd,
 static int corgi_lcd_probe(struct spi_device *spi)
 {
         struct backlight_properties props;
-        struct corgi_lcd_platform_data *pdata = spi->dev.platform_data;
+        struct corgi_lcd_platform_data *pdata = dev_get_platdata(&spi->dev);
         struct corgi_lcd *lcd;
         int ret = 0;
 
@@ -550,8 +550,8 @@ static int corgi_lcd_probe(struct spi_device *spi)
 
         lcd->spi_dev = spi;
 
-        lcd->lcd_dev = lcd_device_register("corgi_lcd", &spi->dev,
-                                        lcd, &corgi_lcd_ops);
+        lcd->lcd_dev = devm_lcd_device_register(&spi->dev, "corgi_lcd",
+                                                &spi->dev, lcd, &corgi_lcd_ops);
         if (IS_ERR(lcd->lcd_dev))
                 return PTR_ERR(lcd->lcd_dev);
 
@@ -561,18 +561,18 @@ static int corgi_lcd_probe(struct spi_device *spi)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = pdata->max_intensity;
-        lcd->bl_dev = backlight_device_register("corgi_bl", &spi->dev, lcd,
-                                                &corgi_bl_ops, &props);
-        if (IS_ERR(lcd->bl_dev)) {
-                ret = PTR_ERR(lcd->bl_dev);
-                goto err_unregister_lcd;
-        }
+        lcd->bl_dev = devm_backlight_device_register(&spi->dev, "corgi_bl",
+                                                &spi->dev, lcd, &corgi_bl_ops,
+                                                &props);
+        if (IS_ERR(lcd->bl_dev))
+                return PTR_ERR(lcd->bl_dev);
+
         lcd->bl_dev->props.brightness = pdata->default_intensity;
         lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
 
         ret = setup_gpio_backlight(lcd, pdata);
         if (ret)
-                goto err_unregister_bl;
+                return ret;
 
         lcd->kick_battery = pdata->kick_battery;
 
@@ -583,12 +583,6 @@ static int corgi_lcd_probe(struct spi_device *spi)
         lcd->limit_mask = pdata->limit_mask;
         the_corgi_lcd = lcd;
         return 0;
-
-err_unregister_bl:
-        backlight_device_unregister(lcd->bl_dev);
-err_unregister_lcd:
-        lcd_device_unregister(lcd->lcd_dev);
-        return ret;
 }
 
 static int corgi_lcd_remove(struct spi_device *spi)
@@ -598,11 +592,7 @@ static int corgi_lcd_remove(struct spi_device *spi)
         lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
         lcd->bl_dev->props.brightness = 0;
         backlight_update_status(lcd->bl_dev);
-        backlight_device_unregister(lcd->bl_dev);
-
         corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
-        lcd_device_unregister(lcd->lcd_dev);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 37bae801e23b..f3fed9ef745f 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -195,16 +195,17 @@ static int cr_backlight_probe(struct platform_device *pdev)
 
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
-        bdp = backlight_device_register("cr-backlight", &pdev->dev, NULL,
-                                        &cr_backlight_ops, &props);
+        bdp = devm_backlight_device_register(&pdev->dev, "cr-backlight",
+                                        &pdev->dev, NULL, &cr_backlight_ops,
+                                        &props);
         if (IS_ERR(bdp)) {
                 pci_dev_put(lpc_dev);
                 return PTR_ERR(bdp);
         }
 
-        ldp = lcd_device_register("cr-lcd", &pdev->dev, NULL, &cr_lcd_ops);
+        ldp = devm_lcd_device_register(&pdev->dev, "cr-lcd", &pdev->dev, NULL,
+                                        &cr_lcd_ops);
         if (IS_ERR(ldp)) {
-                backlight_device_unregister(bdp);
                 pci_dev_put(lpc_dev);
                 return PTR_ERR(ldp);
         }
@@ -215,8 +216,6 @@ static int cr_backlight_probe(struct platform_device *pdev)
 
         crp = devm_kzalloc(&pdev->dev, sizeof(*crp), GFP_KERNEL);
         if (!crp) {
-                lcd_device_unregister(ldp);
-                backlight_device_unregister(bdp);
                 pci_dev_put(lpc_dev);
                 return -ENOMEM;
         }
@@ -241,8 +240,6 @@ static int cr_backlight_remove(struct platform_device *pdev)
         crp->cr_backlight_device->props.max_brightness = 0;
         cr_backlight_set_intensity(crp->cr_backlight_device);
         cr_lcd_set_power(crp->cr_lcd_device, FB_BLANK_POWERDOWN);
-        backlight_device_unregister(crp->cr_backlight_device);
-        lcd_device_unregister(crp->cr_lcd_device);
         pci_dev_put(lpc_dev);
 
         return 0;
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 67cadd30e273..12c5d840c590 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -109,7 +109,7 @@ static const struct backlight_ops da903x_backlight_ops = {
 
 static int da903x_backlight_probe(struct platform_device *pdev)
 {
-        struct da9034_backlight_pdata *pdata = pdev->dev.platform_data;
+        struct da9034_backlight_pdata *pdata = dev_get_platdata(&pdev->dev);
         struct da903x_backlight_data *data;
         struct backlight_device *bl;
         struct backlight_properties props;
@@ -144,8 +144,9 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_brightness;
-        bl = backlight_device_register(pdev->name, data->da903x_dev, data,
-                                       &da903x_backlight_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+                                        data->da903x_dev, data,
+                                        &da903x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -158,21 +159,12 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int da903x_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bl);
-        return 0;
-}
-
 static struct platform_driver da903x_backlight_driver = {
         .driver         = {
                 .name   = "da903x-backlight",
                 .owner  = THIS_MODULE,
         },
         .probe          = da903x_backlight_probe,
-        .remove         = da903x_backlight_remove,
 };
 
 module_platform_driver(da903x_backlight_driver);
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index 842da5a3ac4f..20d55becaa74 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -125,8 +125,9 @@ static int da9052_backlight_probe(struct platform_device *pdev)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = DA9052_MAX_BRIGHTNESS;
 
-        bl = backlight_device_register(pdev->name, wleds->da9052->dev, wleds,
-                                       &da9052_backlight_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+                                        wleds->da9052->dev, wleds,
+                                        &da9052_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "Failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -147,7 +148,6 @@ static int da9052_backlight_remove(struct platform_device *pdev)
         wleds->brightness = 0;
         wleds->state = DA9052_WLEDS_OFF;
         da9052_adjust_wled_brightness(wleds);
-        backlight_device_unregister(bl);
 
         return 0;
 }
diff --git a/drivers/video/backlight/ep93xx_bl.c b/drivers/video/backlight/ep93xx_bl.c
index 018368ba4124..0d1f633c6480 100644
--- a/drivers/video/backlight/ep93xx_bl.c
+++ b/drivers/video/backlight/ep93xx_bl.c
@@ -92,8 +92,8 @@ static int ep93xxbl_probe(struct platform_device *dev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = EP93XX_MAX_BRIGHT;
-        bl = backlight_device_register(dev->name, &dev->dev, ep93xxbl,
-                                       &ep93xxbl_ops, &props);
+        bl = devm_backlight_device_register(&dev->dev, dev->name, &dev->dev,
+                                        ep93xxbl, &ep93xxbl_ops, &props);
         if (IS_ERR(bl))
                 return PTR_ERR(bl);
 
@@ -106,14 +106,6 @@ static int ep93xxbl_probe(struct platform_device *dev)
         return 0;
 }
 
-static int ep93xxbl_remove(struct platform_device *dev)
-{
-        struct backlight_device *bl = platform_get_drvdata(dev);
-
-        backlight_device_unregister(bl);
-        return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int ep93xxbl_suspend(struct device *dev)
 {
@@ -140,7 +132,6 @@ static struct platform_driver ep93xxbl_driver = {
                 .pm     = &ep93xxbl_pm_ops,
         },
         .probe          = ep93xxbl_probe,
-        .remove         = ep93xxbl_remove,
 };
 
 module_platform_driver(ep93xxbl_driver);
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 19e393b41438..5d8d65200db7 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -79,7 +79,7 @@ static const struct backlight_ops genericbl_ops = {
 static int genericbl_probe(struct platform_device *pdev)
 {
         struct backlight_properties props;
-        struct generic_bl_info *machinfo = pdev->dev.platform_data;
+        struct generic_bl_info *machinfo = dev_get_platdata(&pdev->dev);
         const char *name = "generic-bl";
         struct backlight_device *bd;
 
@@ -93,8 +93,8 @@ static int genericbl_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = machinfo->max_intensity;
-        bd = backlight_device_register(name, &pdev->dev, NULL, &genericbl_ops,
-                                       &props);
+        bd = devm_backlight_device_register(&pdev->dev, name, &pdev->dev,
+                                        NULL, &genericbl_ops, &props);
         if (IS_ERR(bd))
                 return PTR_ERR(bd);
 
@@ -118,8 +118,6 @@ static int genericbl_remove(struct platform_device *pdev)
         bd->props.brightness = 0;
         backlight_update_status(bd);
 
-        backlight_device_unregister(bd);
-
         dev_info(&pdev->dev, "Generic Backlight Driver Unloaded\n");
         return 0;
 }
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 5fa217f9f445..81fb12770c2a 100644
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -62,7 +62,8 @@ static const struct backlight_ops gpio_backlight_ops = {
 
 static int gpio_backlight_probe(struct platform_device *pdev)
 {
-        struct gpio_backlight_platform_data *pdata = pdev->dev.platform_data;
+        struct gpio_backlight_platform_data *pdata =
+                dev_get_platdata(&pdev->dev);
         struct backlight_properties props;
         struct backlight_device *bl;
         struct gpio_backlight *gbl;
@@ -94,8 +95,9 @@ static int gpio_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = 1;
-        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, gbl,
-                                       &gpio_backlight_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
+                                        &pdev->dev, gbl, &gpio_backlight_ops,
+                                        &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -108,21 +110,12 @@ static int gpio_backlight_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int gpio_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bl);
-        return 0;
-}
-
 static struct platform_driver gpio_backlight_driver = {
         .driver         = {
                 .name           = "gpio-backlight",
                 .owner          = THIS_MODULE,
         },
         .probe          = gpio_backlight_probe,
-        .remove         = gpio_backlight_remove,
 };
 
 module_platform_driver(gpio_backlight_driver);
diff --git a/drivers/video/backlight/hx8357.c b/drivers/video/backlight/hx8357.c
index c7af8c45ab8a..985e854e244b 100644
--- a/drivers/video/backlight/hx8357.c
+++ b/drivers/video/backlight/hx8357.c
@@ -648,7 +648,8 @@ static int hx8357_probe(struct spi_device *spi)
                 lcd->use_im_pins = 0;
         }
 
-        lcdev = lcd_device_register("mxsfb", &spi->dev, lcd, &hx8357_ops);
+        lcdev = devm_lcd_device_register(&spi->dev, "mxsfb", &spi->dev, lcd,
+                                        &hx8357_ops);
         if (IS_ERR(lcdev)) {
                 ret = PTR_ERR(lcdev);
                 return ret;
@@ -660,32 +661,19 @@ static int hx8357_probe(struct spi_device *spi)
         ret = ((int (*)(struct lcd_device *))match->data)(lcdev);
         if (ret) {
                 dev_err(&spi->dev, "Couldn't initialize panel\n");
-                goto init_error;
+                return ret;
         }
 
         dev_info(&spi->dev, "Panel probed\n");
 
         return 0;
-
-init_error:
-        lcd_device_unregister(lcdev);
-        return ret;
-}
-
-static int hx8357_remove(struct spi_device *spi)
-{
-        struct lcd_device *lcdev = spi_get_drvdata(spi);
-
-        lcd_device_unregister(lcdev);
-        return 0;
 }
 
 static struct spi_driver hx8357_driver = {
         .probe  = hx8357_probe,
-        .remove = hx8357_remove,
         .driver = {
                 .name = "hx8357",
-                .of_match_table = of_match_ptr(hx8357_dt_ids),
+                .of_match_table = hx8357_dt_ids,
         },
 };
 
diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c
index d9f65c2d9b01..73464e4b4c74 100644
--- a/drivers/video/backlight/ili922x.c
+++ b/drivers/video/backlight/ili922x.c
@@ -513,8 +513,8 @@ static int ili922x_probe(struct spi_device *spi)
 
         ili->power = FB_BLANK_POWERDOWN;
 
-        lcd = lcd_device_register("ili922xlcd", &spi->dev, ili,
-                                  &ili922x_ops);
+        lcd = devm_lcd_device_register(&spi->dev, "ili922xlcd", &spi->dev, ili,
+                                        &ili922x_ops);
         if (IS_ERR(lcd)) {
                 dev_err(&spi->dev, "cannot register LCD\n");
                 return PTR_ERR(lcd);
@@ -530,10 +530,7 @@ static int ili922x_probe(struct spi_device *spi)
 
 static int ili922x_remove(struct spi_device *spi)
 {
-        struct ili922x *ili = spi_get_drvdata(spi);
-
         ili922x_poweroff(spi);
-        lcd_device_unregister(ili->ld);
         return 0;
 }
 
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index f8be90c5dedc..e2b8b40a9bd9 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -198,7 +198,7 @@ static void ili9320_setup_spi(struct ili9320 *ili,
 int ili9320_probe_spi(struct spi_device *spi,
                                 struct ili9320_client *client)
 {
-        struct ili9320_platdata *cfg = spi->dev.platform_data;
+        struct ili9320_platdata *cfg = dev_get_platdata(&spi->dev);
         struct device *dev = &spi->dev;
         struct ili9320 *ili;
         struct lcd_device *lcd;
@@ -235,7 +235,8 @@ int ili9320_probe_spi(struct spi_device *spi,
 
         ili9320_setup_spi(ili, spi);
 
-        lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);
+        lcd = devm_lcd_device_register(&spi->dev, "ili9320", dev, ili,
+                                        &ili9320_ops);
         if (IS_ERR(lcd)) {
                 dev_err(dev, "failed to register lcd device\n");
                 return PTR_ERR(lcd);
@@ -248,24 +249,16 @@ int ili9320_probe_spi(struct spi_device *spi,
         ret = ili9320_power(ili, FB_BLANK_UNBLANK);
         if (ret != 0) {
                 dev_err(dev, "failed to set lcd power state\n");
-                goto err_unregister;
+                return ret;
         }
 
         return 0;
-
- err_unregister:
-        lcd_device_unregister(lcd);
-
-        return ret;
 }
 EXPORT_SYMBOL_GPL(ili9320_probe_spi);
 
 int ili9320_remove(struct ili9320 *ili)
 {
         ili9320_power(ili, FB_BLANK_POWERDOWN);
-
-        lcd_device_unregister(ili->lcd);
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(ili9320_remove);
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index bca6ccc74dfb..7592cc25c963 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -141,7 +141,7 @@ static const struct backlight_ops kb3886bl_ops = {
 static int kb3886bl_probe(struct platform_device *pdev)
 {
         struct backlight_properties props;
-        struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data;
+        struct kb3886bl_machinfo *machinfo = dev_get_platdata(&pdev->dev);
 
         bl_machinfo = machinfo;
         if (!machinfo->limit_mask)
@@ -150,10 +150,10 @@ static int kb3886bl_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = machinfo->max_intensity;
-        kb3886_backlight_device = backlight_device_register("kb3886-bl",
-                                                            &pdev->dev, NULL,
-                                                            &kb3886bl_ops,
-                                                            &props);
+        kb3886_backlight_device = devm_backlight_device_register(&pdev->dev,
+                                                        "kb3886-bl", &pdev->dev,
+                                                        NULL, &kb3886bl_ops,
+                                                        &props);
         if (IS_ERR(kb3886_backlight_device))
                 return PTR_ERR(kb3886_backlight_device);
 
@@ -166,18 +166,8 @@ static int kb3886bl_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int kb3886bl_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bd = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bd);
-
-        return 0;
-}
-
 static struct platform_driver kb3886bl_driver = {
         .probe          = kb3886bl_probe,
-        .remove         = kb3886bl_remove,
         .driver         = {
                 .name   = "kb3886-bl",
                 .pm     = &kb3886bl_pm_ops,
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index a35a38c709cf..923eae2f85f8 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -48,7 +48,7 @@ static void l4f00242t03_reset(unsigned int gpio)
 
 static void l4f00242t03_lcd_init(struct spi_device *spi)
 {
-        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
+        struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
         struct l4f00242t03_priv *priv = spi_get_drvdata(spi);
         const u16 cmd[] = { 0x36, param(0), 0x3A, param(0x60) };
         int ret;
@@ -88,7 +88,7 @@ static void l4f00242t03_lcd_init(struct spi_device *spi)
 
 static void l4f00242t03_lcd_powerdown(struct spi_device *spi)
 {
-        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
+        struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
         struct l4f00242t03_priv *priv = spi_get_drvdata(spi);
 
         dev_dbg(&spi->dev, "Powering down LCD\n");
@@ -171,7 +171,7 @@ static struct lcd_ops l4f_ops = {
 static int l4f00242t03_probe(struct spi_device *spi)
 {
         struct l4f00242t03_priv *priv;
-        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
+        struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
         int ret;
 
         if (pdata == NULL) {
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 1e0a3093ce50..506a6c236039 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -702,7 +702,7 @@ static int ld9040_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = spi->dev.platform_data;
+        lcd->lcd_pd = dev_get_platdata(&spi->dev);
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
                 return -EINVAL;
@@ -716,7 +716,8 @@ static int ld9040_probe(struct spi_device *spi)
                 return ret;
         }
 
-        ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
+        ld = devm_lcd_device_register(&spi->dev, "ld9040", &spi->dev, lcd,
+                                        &ld9040_lcd_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -726,12 +727,10 @@ static int ld9040_probe(struct spi_device *spi)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
 
-        bd = backlight_device_register("ld9040-bl", &spi->dev,
-                lcd, &ld9040_backlight_ops, &props);
-        if (IS_ERR(bd)) {
-                ret = PTR_ERR(bd);
-                goto out_unregister_lcd;
-        }
+        bd = devm_backlight_device_register(&spi->dev, "ld9040-bl", &spi->dev,
+                                        lcd, &ld9040_backlight_ops, &props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
 
         bd->props.brightness = MAX_BRIGHTNESS;
         lcd->bd = bd;
@@ -757,11 +756,6 @@ static int ld9040_probe(struct spi_device *spi)
 
         dev_info(&spi->dev, "ld9040 panel driver has been probed.\n");
         return 0;
-
-out_unregister_lcd:
-        lcd_device_unregister(lcd->ld);
-
-        return ret;
 }
 
 static int ld9040_remove(struct spi_device *spi)
@@ -769,9 +763,6 @@ static int ld9040_remove(struct spi_device *spi)
         struct ld9040 *lcd = spi_get_drvdata(spi);
 
         ld9040_power(lcd, FB_BLANK_POWERDOWN);
-        backlight_device_unregister(lcd->bd);
-        lcd_device_unregister(lcd->ld);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/ld9040_gamma.h b/drivers/video/backlight/ld9040_gamma.h
index 038d9c86ec03..c5e586d97385 100644
--- a/drivers/video/backlight/ld9040_gamma.h
+++ b/drivers/video/backlight/ld9040_gamma.h
@@ -169,7 +169,9 @@ static const unsigned int ld9040_22_50[] = {
 
 struct ld9040_gamma {
         unsigned int *gamma_22_table[MAX_GAMMA_LEVEL];
-} gamma_table = {
+};
+
+static struct ld9040_gamma gamma_table = {
         .gamma_22_table[0] = (unsigned int *)&ld9040_22_50,
         .gamma_22_table[1] = (unsigned int *)&ld9040_22_70,
         .gamma_22_table[2] = (unsigned int *)&ld9040_22_80,
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 1d1dbfb789e3..187d1c283c1d 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -284,7 +284,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
         if (!lm3533)
                 return -EINVAL;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data\n");
                 return -EINVAL;
@@ -313,8 +313,9 @@ static int lm3533_bl_probe(struct platform_device *pdev)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = LM3533_BL_MAX_BRIGHTNESS;
         props.brightness = pdata->default_brightness;
-        bd = backlight_device_register(pdata->name, pdev->dev.parent, bl,
-                                                &lm3533_bl_ops, &props);
+        bd = devm_backlight_device_register(&pdev->dev, pdata->name,
+                                        pdev->dev.parent, bl, &lm3533_bl_ops,
+                                        &props);
         if (IS_ERR(bd)) {
                 dev_err(&pdev->dev, "failed to register backlight device\n");
                 return PTR_ERR(bd);
@@ -328,7 +329,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
         ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to create sysfs attributes\n");
-                goto err_unregister;
+                return ret;
         }
 
         backlight_update_status(bd);
@@ -345,8 +346,6 @@ static int lm3533_bl_probe(struct platform_device *pdev)
 
 err_sysfs_remove:
         sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
-err_unregister:
-        backlight_device_unregister(bd);
 
         return ret;
 }
@@ -363,7 +362,6 @@ static int lm3533_bl_remove(struct platform_device *pdev)
 
         lm3533_ctrlbank_disable(&bl->cb);
         sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
-        backlight_device_unregister(bd);
 
         return 0;
 }
diff --git a/drivers/video/backlight/lm3630_bl.c b/drivers/video/backlight/lm3630_bl.c
deleted file mode 100644
index 76a62e978fc3..000000000000
--- a/drivers/video/backlight/lm3630_bl.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
-* Simple driver for Texas Instruments LM3630 Backlight driver chip
-* Copyright (C) 2012 Texas Instruments
-*
-* 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
-* published by the Free Software Foundation.
-*
-*/
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/backlight.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-#include <linux/uaccess.h>
-#include <linux/interrupt.h>
-#include <linux/regmap.h>
-#include <linux/platform_data/lm3630_bl.h>
-
-#define REG_CTRL        0x00
-#define REG_CONFIG      0x01
-#define REG_BRT_A       0x03
-#define REG_BRT_B       0x04
-#define REG_INT_STATUS  0x09
-#define REG_INT_EN      0x0A
-#define REG_FAULT       0x0B
-#define REG_PWM_OUTLOW  0x12
-#define REG_PWM_OUTHIGH 0x13
-#define REG_MAX         0x1F
-
-#define INT_DEBOUNCE_MSEC       10
-
-enum lm3630_leds {
-        BLED_ALL = 0,
-        BLED_1,
-        BLED_2
-};
-
-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 */
-};
-
-struct lm3630_chip_data {
-        struct device *dev;
-        struct delayed_work work;
-        int irq;
-        struct workqueue_struct *irqthread;
-        struct lm3630_platform_data *pdata;
-        struct backlight_device *bled1;
-        struct backlight_device *bled2;
-        struct regmap *regmap;
-};
-
-/* initialize chip */
-static int lm3630_chip_init(struct lm3630_chip_data *pchip)
-{
-        int ret;
-        unsigned int reg_val;
-        struct lm3630_platform_data *pdata = pchip->pdata;
-
-        /*pwm control */
-        reg_val = ((pdata->pwm_active & 0x01) << 2) | (pdata->pwm_ctrl & 0x03);
-        ret = regmap_update_bits(pchip->regmap, REG_CONFIG, 0x07, reg_val);
-        if (ret < 0)
-                goto out;
-
-        /* bank control */
-        reg_val = ((pdata->bank_b_ctrl & 0x01) << 1) |
-                        (pdata->bank_a_ctrl & 0x07);
-        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x07, reg_val);
-        if (ret < 0)
-                goto out;
-
-        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-        if (ret < 0)
-                goto out;
-
-        /* set initial brightness */
-        if (pdata->bank_a_ctrl != BANK_A_CTRL_DISABLE) {
-                ret = regmap_write(pchip->regmap,
-                                   REG_BRT_A, pdata->init_brt_led1);
-                if (ret < 0)
-                        goto out;
-        }
-
-        if (pdata->bank_b_ctrl != BANK_B_CTRL_DISABLE) {
-                ret = regmap_write(pchip->regmap,
-                                   REG_BRT_B, pdata->init_brt_led2);
-                if (ret < 0)
-                        goto out;
-        }
-        return ret;
-
-out:
-        dev_err(pchip->dev, "i2c failed to access register\n");
-        return ret;
-}
-
-/* interrupt handling */
-static void lm3630_delayed_func(struct work_struct *work)
-{
-        int ret;
-        unsigned int reg_val;
-        struct lm3630_chip_data *pchip;
-
-        pchip = container_of(work, struct lm3630_chip_data, work.work);
-
-        ret = regmap_read(pchip->regmap, REG_INT_STATUS, &reg_val);
-        if (ret < 0) {
-                dev_err(pchip->dev,
-                        "i2c failed to access REG_INT_STATUS Register\n");
-                return;
-        }
-
-        dev_info(pchip->dev, "REG_INT_STATUS Register is 0x%x\n", reg_val);
-}
-
-static irqreturn_t lm3630_isr_func(int irq, void *chip)
-{
-        int ret;
-        struct lm3630_chip_data *pchip = chip;
-        unsigned long delay = msecs_to_jiffies(INT_DEBOUNCE_MSEC);
-
-        queue_delayed_work(pchip->irqthread, &pchip->work, delay);
-
-        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-        if (ret < 0)
-                goto out;
-
-        return IRQ_HANDLED;
-out:
-        dev_err(pchip->dev, "i2c failed to access register\n");
-        return IRQ_HANDLED;
-}
-
-static int lm3630_intr_config(struct lm3630_chip_data *pchip)
-{
-        INIT_DELAYED_WORK(&pchip->work, lm3630_delayed_func);
-        pchip->irqthread = create_singlethread_workqueue("lm3630-irqthd");
-        if (!pchip->irqthread) {
-                dev_err(pchip->dev, "create irq thread fail...\n");
-                return -1;
-        }
-        if (request_threaded_irq
-            (pchip->irq, NULL, lm3630_isr_func,
-             IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "lm3630_irq", pchip)) {
-                dev_err(pchip->dev, "request threaded irq fail..\n");
-                return -1;
-        }
-        return 0;
-}
-
-static bool
-set_intensity(struct backlight_device *bl, struct lm3630_chip_data *pchip)
-{
-        if (!pchip->pdata->pwm_set_intensity)
-                return false;
-        pchip->pdata->pwm_set_intensity(bl->props.brightness - 1,
-                                        pchip->pdata->pwm_period);
-        return true;
-}
-
-/* update and get brightness */
-static int lm3630_bank_a_update_status(struct backlight_device *bl)
-{
-        int ret;
-        struct lm3630_chip_data *pchip = bl_get_data(bl);
-        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
-
-        /* brightness 0 means disable */
-        if (!bl->props.brightness) {
-                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x04, 0x00);
-                if (ret < 0)
-                        goto out;
-                return bl->props.brightness;
-        }
-
-        /* pwm control */
-        if (pwm_ctrl == PWM_CTRL_BANK_A || pwm_ctrl == PWM_CTRL_BANK_ALL) {
-                if (!set_intensity(bl, pchip))
-                        dev_err(pchip->dev, "No pwm control func. in plat-data\n");
-        } else {
-
-                /* i2c control */
-                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-                if (ret < 0)
-                        goto out;
-                mdelay(1);
-                ret = regmap_write(pchip->regmap,
-                                   REG_BRT_A, bl->props.brightness - 1);
-                if (ret < 0)
-                        goto out;
-        }
-        return bl->props.brightness;
-out:
-        dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");
-        return bl->props.brightness;
-}
-
-static int lm3630_bank_a_get_brightness(struct backlight_device *bl)
-{
-        unsigned int reg_val;
-        int brightness, ret;
-        struct lm3630_chip_data *pchip = bl_get_data(bl);
-        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
-
-        if (pwm_ctrl == PWM_CTRL_BANK_A || pwm_ctrl == PWM_CTRL_BANK_ALL) {
-                ret = regmap_read(pchip->regmap, REG_PWM_OUTHIGH, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = reg_val & 0x01;
-                ret = regmap_read(pchip->regmap, REG_PWM_OUTLOW, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = ((brightness << 8) | reg_val) + 1;
-        } else {
-                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-                if (ret < 0)
-                        goto out;
-                mdelay(1);
-                ret = regmap_read(pchip->regmap, REG_BRT_A, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = reg_val + 1;
-        }
-        bl->props.brightness = brightness;
-        return bl->props.brightness;
-out:
-        dev_err(pchip->dev, "i2c failed to access register\n");
-        return 0;
-}
-
-static const struct backlight_ops lm3630_bank_a_ops = {
-        .options = BL_CORE_SUSPENDRESUME,
-        .update_status = lm3630_bank_a_update_status,
-        .get_brightness = lm3630_bank_a_get_brightness,
-};
-
-static int lm3630_bank_b_update_status(struct backlight_device *bl)
-{
-        int ret;
-        struct lm3630_chip_data *pchip = bl_get_data(bl);
-        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
-
-        if (pwm_ctrl == PWM_CTRL_BANK_B || pwm_ctrl == PWM_CTRL_BANK_ALL) {
-                if (!set_intensity(bl, pchip))
-                        dev_err(pchip->dev,
-                                "no pwm control func. in plat-data\n");
-        } else {
-                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-                if (ret < 0)
-                        goto out;
-                mdelay(1);
-                ret = regmap_write(pchip->regmap,
-                                   REG_BRT_B, bl->props.brightness - 1);
-        }
-        return bl->props.brightness;
-out:
-        dev_err(pchip->dev, "i2c failed to access register\n");
-        return bl->props.brightness;
-}
-
-static int lm3630_bank_b_get_brightness(struct backlight_device *bl)
-{
-        unsigned int reg_val;
-        int brightness, ret;
-        struct lm3630_chip_data *pchip = bl_get_data(bl);
-        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
-
-        if (pwm_ctrl == PWM_CTRL_BANK_B || pwm_ctrl == PWM_CTRL_BANK_ALL) {
-                ret = regmap_read(pchip->regmap, REG_PWM_OUTHIGH, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = reg_val & 0x01;
-                ret = regmap_read(pchip->regmap, REG_PWM_OUTLOW, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = ((brightness << 8) | reg_val) + 1;
-        } else {
-                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
-                if (ret < 0)
-                        goto out;
-                mdelay(1);
-                ret = regmap_read(pchip->regmap, REG_BRT_B, &reg_val);
-                if (ret < 0)
-                        goto out;
-                brightness = reg_val + 1;
-        }
-        bl->props.brightness = brightness;
-
-        return bl->props.brightness;
-out:
-        dev_err(pchip->dev, "i2c failed to access register\n");
-        return bl->props.brightness;
-}
-
-static const struct backlight_ops lm3630_bank_b_ops = {
-        .options = BL_CORE_SUSPENDRESUME,
-        .update_status = lm3630_bank_b_update_status,
-        .get_brightness = lm3630_bank_b_get_brightness,
-};
-
-static int lm3630_backlight_register(struct lm3630_chip_data *pchip,
-                                     enum lm3630_leds ledno)
-{
-        const char *name = bled_name[ledno];
-        struct backlight_properties props;
-        struct lm3630_platform_data *pdata = pchip->pdata;
-
-        props.type = BACKLIGHT_RAW;
-        switch (ledno) {
-        case BLED_1:
-        case BLED_ALL:
-                props.brightness = pdata->init_brt_led1;
-                props.max_brightness = pdata->max_brt_led1;
-                pchip->bled1 =
-                    backlight_device_register(name, pchip->dev, pchip,
-                                              &lm3630_bank_a_ops, &props);
-                if (IS_ERR(pchip->bled1))
-                        return PTR_ERR(pchip->bled1);
-                break;
-        case BLED_2:
-                props.brightness = pdata->init_brt_led2;
-                props.max_brightness = pdata->max_brt_led2;
-                pchip->bled2 =
-                    backlight_device_register(name, pchip->dev, pchip,
-                                              &lm3630_bank_b_ops, &props);
-                if (IS_ERR(pchip->bled2))
-                        return PTR_ERR(pchip->bled2);
-                break;
-        }
-        return 0;
-}
-
-static void lm3630_backlight_unregister(struct lm3630_chip_data *pchip)
-{
-        if (pchip->bled1)
-                backlight_device_unregister(pchip->bled1);
-        if (pchip->bled2)
-                backlight_device_unregister(pchip->bled2);
-}
-
-static const struct regmap_config lm3630_regmap = {
-        .reg_bits = 8,
-        .val_bits = 8,
-        .max_register = REG_MAX,
-};
-
-static int lm3630_probe(struct i2c_client *client,
-                                  const struct i2c_device_id *id)
-{
-        struct lm3630_platform_data *pdata = client->dev.platform_data;
-        struct lm3630_chip_data *pchip;
-        int ret;
-
-        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
-                dev_err(&client->dev, "fail : i2c functionality check...\n");
-                return -EOPNOTSUPP;
-        }
-
-        if (pdata == NULL) {
-                dev_err(&client->dev, "fail : no platform data.\n");
-                return -ENODATA;
-        }
-
-        pchip = devm_kzalloc(&client->dev, sizeof(struct lm3630_chip_data),
-                             GFP_KERNEL);
-        if (!pchip)
-                return -ENOMEM;
-        pchip->pdata = pdata;
-        pchip->dev = &client->dev;
-
-        pchip->regmap = devm_regmap_init_i2c(client, &lm3630_regmap);
-        if (IS_ERR(pchip->regmap)) {
-                ret = PTR_ERR(pchip->regmap);
-                dev_err(&client->dev, "fail : allocate register map: %d\n",
-                        ret);
-                return ret;
-        }
-        i2c_set_clientdata(client, pchip);
-
-        /* chip initialize */
-        ret = lm3630_chip_init(pchip);
-        if (ret < 0) {
-                dev_err(&client->dev, "fail : init chip\n");
-                goto err_chip_init;
-        }
-
-        switch (pdata->bank_a_ctrl) {
-        case BANK_A_CTRL_ALL:
-                ret = lm3630_backlight_register(pchip, BLED_ALL);
-                pdata->bank_b_ctrl = BANK_B_CTRL_DISABLE;
-                break;
-        case BANK_A_CTRL_LED1:
-                ret = lm3630_backlight_register(pchip, BLED_1);
-                break;
-        case BANK_A_CTRL_LED2:
-                ret = lm3630_backlight_register(pchip, BLED_2);
-                pdata->bank_b_ctrl = BANK_B_CTRL_DISABLE;
-                break;
-        default:
-                break;
-        }
-
-        if (ret < 0)
-                goto err_bl_reg;
-
-        if (pdata->bank_b_ctrl && pchip->bled2 == NULL) {
-                ret = lm3630_backlight_register(pchip, BLED_2);
-                if (ret < 0)
-                        goto err_bl_reg;
-        }
-
-        /* interrupt enable  : irq 0 is not allowed for lm3630 */
-        pchip->irq = client->irq;
-        if (pchip->irq)
-                lm3630_intr_config(pchip);
-
-        dev_info(&client->dev, "LM3630 backlight register OK.\n");
-        return 0;
-
-err_bl_reg:
-        dev_err(&client->dev, "fail : backlight register.\n");
-        lm3630_backlight_unregister(pchip);
-err_chip_init:
-        return ret;
-}
-
-static int lm3630_remove(struct i2c_client *client)
-{
-        int ret;
-        struct lm3630_chip_data *pchip = i2c_get_clientdata(client);
-
-        ret = regmap_write(pchip->regmap, REG_BRT_A, 0);
-        if (ret < 0)
-                dev_err(pchip->dev, "i2c failed to access register\n");
-
-        ret = regmap_write(pchip->regmap, REG_BRT_B, 0);
-        if (ret < 0)
-                dev_err(pchip->dev, "i2c failed to access register\n");
-
-        lm3630_backlight_unregister(pchip);
-        if (pchip->irq) {
-                free_irq(pchip->irq, pchip);
-                flush_workqueue(pchip->irqthread);
-                destroy_workqueue(pchip->irqthread);
-        }
-        return 0;
-}
-
-static const struct i2c_device_id lm3630_id[] = {
-        {LM3630_NAME, 0},
-        {}
-};
-
-MODULE_DEVICE_TABLE(i2c, lm3630_id);
-
-static struct i2c_driver lm3630_i2c_driver = {
-        .driver = {
-                   .name = LM3630_NAME,
-                   },
-        .probe = lm3630_probe,
-        .remove = lm3630_remove,
-        .id_table = lm3630_id,
-};
-
-module_i2c_driver(lm3630_i2c_driver);
-
-MODULE_DESCRIPTION("Texas Instruments Backlight driver for LM3630");
-MODULE_AUTHOR("G.Shark Jeong <gshark.jeong@gmail.com>");
-MODULE_AUTHOR("Daniel Jeong <daniel.jeong@ti.com>");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c
new file mode 100644
index 000000000000..35fe4825a454
--- /dev/null
+++ b/drivers/video/backlight/lm3630a_bl.c
@@ -0,0 +1,483 @@
+/*
+* Simple driver for Texas Instruments LM3630A Backlight driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* 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
+* published by the Free Software Foundation.
+*
+*/
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/regmap.h>
+#include <linux/pwm.h>
+#include <linux/platform_data/lm3630a_bl.h>
+
+#define REG_CTRL        0x00
+#define REG_BOOST       0x02
+#define REG_CONFIG      0x01
+#define REG_BRT_A       0x03
+#define REG_BRT_B       0x04
+#define REG_I_A         0x05
+#define REG_I_B         0x06
+#define REG_INT_STATUS  0x09
+#define REG_INT_EN      0x0A
+#define REG_FAULT       0x0B
+#define REG_PWM_OUTLOW  0x12
+#define REG_PWM_OUTHIGH 0x13
+#define REG_MAX         0x1F
+
+#define INT_DEBOUNCE_MSEC       10
+struct lm3630a_chip {
+        struct device *dev;
+        struct delayed_work work;
+
+        int irq;
+        struct workqueue_struct *irqthread;
+        struct lm3630a_platform_data *pdata;
+        struct backlight_device *bleda;
+        struct backlight_device *bledb;
+        struct regmap *regmap;
+        struct pwm_device *pwmd;
+};
+
+/* i2c access */
+static int lm3630a_read(struct lm3630a_chip *pchip, unsigned int reg)
+{
+        int rval;
+        unsigned int reg_val;
+
+        rval = regmap_read(pchip->regmap, reg, &reg_val);
+        if (rval < 0)
+                return rval;
+        return reg_val & 0xFF;
+}
+
+static int lm3630a_write(struct lm3630a_chip *pchip,
+                         unsigned int reg, unsigned int data)
+{
+        return regmap_write(pchip->regmap, reg, data);
+}
+
+static int lm3630a_update(struct lm3630a_chip *pchip,
+                          unsigned int reg, unsigned int mask,
+                          unsigned int data)
+{
+        return regmap_update_bits(pchip->regmap, reg, mask, data);
+}
+
+/* initialize chip */
+static int lm3630a_chip_init(struct lm3630a_chip *pchip)
+{
+        int rval;
+        struct lm3630a_platform_data *pdata = pchip->pdata;
+
+        usleep_range(1000, 2000);
+        /* set Filter Strength Register */
+        rval = lm3630a_write(pchip, 0x50, 0x03);
+        /* set Cofig. register */
+        rval |= lm3630a_update(pchip, REG_CONFIG, 0x07, pdata->pwm_ctrl);
+        /* set boost control */
+        rval |= lm3630a_write(pchip, REG_BOOST, 0x38);
+        /* set current A */
+        rval |= lm3630a_update(pchip, REG_I_A, 0x1F, 0x1F);
+        /* set current B */
+        rval |= lm3630a_write(pchip, REG_I_B, 0x1F);
+        /* set control */
+        rval |= lm3630a_update(pchip, REG_CTRL, 0x14, pdata->leda_ctrl);
+        rval |= lm3630a_update(pchip, REG_CTRL, 0x0B, pdata->ledb_ctrl);
+        usleep_range(1000, 2000);
+        /* set brightness A and B */
+        rval |= lm3630a_write(pchip, REG_BRT_A, pdata->leda_init_brt);
+        rval |= lm3630a_write(pchip, REG_BRT_B, pdata->ledb_init_brt);
+
+        if (rval < 0)
+                dev_err(pchip->dev, "i2c failed to access register\n");
+        return rval;
+}
+
+/* interrupt handling */
+static void lm3630a_delayed_func(struct work_struct *work)
+{
+        int rval;
+        struct lm3630a_chip *pchip;
+
+        pchip = container_of(work, struct lm3630a_chip, work.work);
+
+        rval = lm3630a_read(pchip, REG_INT_STATUS);
+        if (rval < 0) {
+                dev_err(pchip->dev,
+                        "i2c failed to access REG_INT_STATUS Register\n");
+                return;
+        }
+
+        dev_info(pchip->dev, "REG_INT_STATUS Register is 0x%x\n", rval);
+}
+
+static irqreturn_t lm3630a_isr_func(int irq, void *chip)
+{
+        int rval;
+        struct lm3630a_chip *pchip = chip;
+        unsigned long delay = msecs_to_jiffies(INT_DEBOUNCE_MSEC);
+
+        queue_delayed_work(pchip->irqthread, &pchip->work, delay);
+
+        rval = lm3630a_update(pchip, REG_CTRL, 0x80, 0x00);
+        if (rval < 0) {
+                dev_err(pchip->dev, "i2c failed to access register\n");
+                return IRQ_NONE;
+        }
+        return IRQ_HANDLED;
+}
+
+static int lm3630a_intr_config(struct lm3630a_chip *pchip)
+{
+        int rval;
+
+        rval = lm3630a_write(pchip, REG_INT_EN, 0x87);
+        if (rval < 0)
+                return rval;
+
+        INIT_DELAYED_WORK(&pchip->work, lm3630a_delayed_func);
+        pchip->irqthread = create_singlethread_workqueue("lm3630a-irqthd");
+        if (!pchip->irqthread) {
+                dev_err(pchip->dev, "create irq thread fail\n");
+                return -ENOMEM;
+        }
+        if (request_threaded_irq
+            (pchip->irq, NULL, lm3630a_isr_func,
+             IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "lm3630a_irq", pchip)) {
+                dev_err(pchip->dev, "request threaded irq fail\n");
+                destroy_workqueue(pchip->irqthread);
+                return -ENOMEM;
+        }
+        return rval;
+}
+
+static void lm3630a_pwm_ctrl(struct lm3630a_chip *pchip, int br, int br_max)
+{
+        unsigned int period = pwm_get_period(pchip->pwmd);
+        unsigned int duty = br * period / br_max;
+
+        pwm_config(pchip->pwmd, duty, period);
+        if (duty)
+                pwm_enable(pchip->pwmd);
+        else
+                pwm_disable(pchip->pwmd);
+}
+
+/* update and get brightness */
+static int lm3630a_bank_a_update_status(struct backlight_device *bl)
+{
+        int ret;
+        struct lm3630a_chip *pchip = bl_get_data(bl);
+        enum lm3630a_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        /* pwm control */
+        if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) {
+                lm3630a_pwm_ctrl(pchip, bl->props.brightness,
+                                 bl->props.max_brightness);
+                return bl->props.brightness;
+        }
+
+        /* disable sleep */
+        ret = lm3630a_update(pchip, REG_CTRL, 0x80, 0x00);
+        if (ret < 0)
+                goto out_i2c_err;
+        usleep_range(1000, 2000);
+        /* minimum brightness is 0x04 */
+        ret = lm3630a_write(pchip, REG_BRT_A, bl->props.brightness);
+        if (bl->props.brightness < 0x4)
+                ret |= lm3630a_update(pchip, REG_CTRL, LM3630A_LEDA_ENABLE, 0);
+        else
+                ret |= lm3630a_update(pchip, REG_CTRL,
+                                      LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);
+        if (ret < 0)
+                goto out_i2c_err;
+        return bl->props.brightness;
+
+out_i2c_err:
+        dev_err(pchip->dev, "i2c failed to access\n");
+        return bl->props.brightness;
+}
+
+static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
+{
+        int brightness, rval;
+        struct lm3630a_chip *pchip = bl_get_data(bl);
+        enum lm3630a_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) {
+                rval = lm3630a_read(pchip, REG_PWM_OUTHIGH);
+                if (rval < 0)
+                        goto out_i2c_err;
+                brightness = (rval & 0x01) << 8;
+                rval = lm3630a_read(pchip, REG_PWM_OUTLOW);
+                if (rval < 0)
+                        goto out_i2c_err;
+                brightness |= rval;
+                goto out;
+        }
+
+        /* disable sleep */
+        rval = lm3630a_update(pchip, REG_CTRL, 0x80, 0x00);
+        if (rval < 0)
+                goto out_i2c_err;
+        usleep_range(1000, 2000);
+        rval = lm3630a_read(pchip, REG_BRT_A);
+        if (rval < 0)
+                goto out_i2c_err;
+        brightness = rval;
+
+out:
+        bl->props.brightness = brightness;
+        return bl->props.brightness;
+out_i2c_err:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return 0;
+}
+
+static const struct backlight_ops lm3630a_bank_a_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lm3630a_bank_a_update_status,
+        .get_brightness = lm3630a_bank_a_get_brightness,
+};
+
+/* update and get brightness */
+static int lm3630a_bank_b_update_status(struct backlight_device *bl)
+{
+        int ret;
+        struct lm3630a_chip *pchip = bl_get_data(bl);
+        enum lm3630a_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        /* pwm control */
+        if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) {
+                lm3630a_pwm_ctrl(pchip, bl->props.brightness,
+                                 bl->props.max_brightness);
+                return bl->props.brightness;
+        }
+
+        /* disable sleep */
+        ret = lm3630a_update(pchip, REG_CTRL, 0x80, 0x00);
+        if (ret < 0)
+                goto out_i2c_err;
+        usleep_range(1000, 2000);
+        /* minimum brightness is 0x04 */
+        ret = lm3630a_write(pchip, REG_BRT_B, bl->props.brightness);
+        if (bl->props.brightness < 0x4)
+                ret |= lm3630a_update(pchip, REG_CTRL, LM3630A_LEDB_ENABLE, 0);
+        else
+                ret |= lm3630a_update(pchip, REG_CTRL,
+                                      LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);
+        if (ret < 0)
+                goto out_i2c_err;
+        return bl->props.brightness;
+
+out_i2c_err:
+        dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");
+        return bl->props.brightness;
+}
+
+static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)
+{
+        int brightness, rval;
+        struct lm3630a_chip *pchip = bl_get_data(bl);
+        enum lm3630a_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) {
+                rval = lm3630a_read(pchip, REG_PWM_OUTHIGH);
+                if (rval < 0)
+                        goto out_i2c_err;
+                brightness = (rval & 0x01) << 8;
+                rval = lm3630a_read(pchip, REG_PWM_OUTLOW);
+                if (rval < 0)
+                        goto out_i2c_err;
+                brightness |= rval;
+                goto out;
+        }
+
+        /* disable sleep */
+        rval = lm3630a_update(pchip, REG_CTRL, 0x80, 0x00);
+        if (rval < 0)
+                goto out_i2c_err;
+        usleep_range(1000, 2000);
+        rval = lm3630a_read(pchip, REG_BRT_B);
+        if (rval < 0)
+                goto out_i2c_err;
+        brightness = rval;
+
+out:
+        bl->props.brightness = brightness;
+        return bl->props.brightness;
+out_i2c_err:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return 0;
+}
+
+static const struct backlight_ops lm3630a_bank_b_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lm3630a_bank_b_update_status,
+        .get_brightness = lm3630a_bank_b_get_brightness,
+};
+
+static int lm3630a_backlight_register(struct lm3630a_chip *pchip)
+{
+        struct backlight_properties props;
+        struct lm3630a_platform_data *pdata = pchip->pdata;
+
+        props.type = BACKLIGHT_RAW;
+        if (pdata->leda_ctrl != LM3630A_LEDA_DISABLE) {
+                props.brightness = pdata->leda_init_brt;
+                props.max_brightness = pdata->leda_max_brt;
+                pchip->bleda =
+                    devm_backlight_device_register(pchip->dev, "lm3630a_leda",
+                                                   pchip->dev, pchip,
+                                                   &lm3630a_bank_a_ops, &props);
+                if (IS_ERR(pchip->bleda))
+                        return PTR_ERR(pchip->bleda);
+        }
+
+        if ((pdata->ledb_ctrl != LM3630A_LEDB_DISABLE) &&
+            (pdata->ledb_ctrl != LM3630A_LEDB_ON_A)) {
+                props.brightness = pdata->ledb_init_brt;
+                props.max_brightness = pdata->ledb_max_brt;
+                pchip->bledb =
+                    devm_backlight_device_register(pchip->dev, "lm3630a_ledb",
+                                                   pchip->dev, pchip,
+                                                   &lm3630a_bank_b_ops, &props);
+                if (IS_ERR(pchip->bledb))
+                        return PTR_ERR(pchip->bledb);
+        }
+        return 0;
+}
+
+static const struct regmap_config lm3630a_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = REG_MAX,
+};
+
+static int lm3630a_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct lm3630a_platform_data *pdata = dev_get_platdata(&client->dev);
+        struct lm3630a_chip *pchip;
+        int rval;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "fail : i2c functionality check\n");
+                return -EOPNOTSUPP;
+        }
+
+        pchip = devm_kzalloc(&client->dev, sizeof(struct lm3630a_chip),
+                             GFP_KERNEL);
+        if (!pchip)
+                return -ENOMEM;
+        pchip->dev = &client->dev;
+
+        pchip->regmap = devm_regmap_init_i2c(client, &lm3630a_regmap);
+        if (IS_ERR(pchip->regmap)) {
+                rval = PTR_ERR(pchip->regmap);
+                dev_err(&client->dev, "fail : allocate reg. map: %d\n", rval);
+                return rval;
+        }
+
+        i2c_set_clientdata(client, pchip);
+        if (pdata == NULL) {
+                pdata = devm_kzalloc(pchip->dev,
+                                     sizeof(struct lm3630a_platform_data),
+                                     GFP_KERNEL);
+                if (pdata == NULL)
+                        return -ENOMEM;
+                /* default values */
+                pdata->leda_ctrl = LM3630A_LEDA_ENABLE;
+                pdata->ledb_ctrl = LM3630A_LEDB_ENABLE;
+                pdata->leda_max_brt = LM3630A_MAX_BRIGHTNESS;
+                pdata->ledb_max_brt = LM3630A_MAX_BRIGHTNESS;
+                pdata->leda_init_brt = LM3630A_MAX_BRIGHTNESS;
+                pdata->ledb_init_brt = LM3630A_MAX_BRIGHTNESS;
+        }
+        pchip->pdata = pdata;
+
+        /* chip initialize */
+        rval = lm3630a_chip_init(pchip);
+        if (rval < 0) {
+                dev_err(&client->dev, "fail : init chip\n");
+                return rval;
+        }
+        /* backlight register */
+        rval = lm3630a_backlight_register(pchip);
+        if (rval < 0) {
+                dev_err(&client->dev, "fail : backlight register.\n");
+                return rval;
+        }
+        /* pwm */
+        if (pdata->pwm_ctrl != LM3630A_PWM_DISABLE) {
+                pchip->pwmd = devm_pwm_get(pchip->dev, "lm3630a-pwm");
+                if (IS_ERR(pchip->pwmd)) {
+                        dev_err(&client->dev, "fail : get pwm device\n");
+                        return PTR_ERR(pchip->pwmd);
+                }
+        }
+        pchip->pwmd->period = pdata->pwm_period;
+
+        /* interrupt enable  : irq 0 is not allowed */
+        pchip->irq = client->irq;
+        if (pchip->irq) {
+                rval = lm3630a_intr_config(pchip);
+                if (rval < 0)
+                        return rval;
+        }
+        dev_info(&client->dev, "LM3630A backlight register OK.\n");
+        return 0;
+}
+
+static int lm3630a_remove(struct i2c_client *client)
+{
+        int rval;
+        struct lm3630a_chip *pchip = i2c_get_clientdata(client);
+
+        rval = lm3630a_write(pchip, REG_BRT_A, 0);
+        if (rval < 0)
+                dev_err(pchip->dev, "i2c failed to access register\n");
+
+        rval = lm3630a_write(pchip, REG_BRT_B, 0);
+        if (rval < 0)
+                dev_err(pchip->dev, "i2c failed to access register\n");
+
+        if (pchip->irq) {
+                free_irq(pchip->irq, pchip);
+                flush_workqueue(pchip->irqthread);
+                destroy_workqueue(pchip->irqthread);
+        }
+        return 0;
+}
+
+static const struct i2c_device_id lm3630a_id[] = {
+        {LM3630A_NAME, 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, lm3630a_id);
+
+static struct i2c_driver lm3630a_i2c_driver = {
+        .driver = {
+                   .name = LM3630A_NAME,
+                   },
+        .probe = lm3630a_probe,
+        .remove = lm3630a_remove,
+        .id_table = lm3630a_id,
+};
+
+module_i2c_driver(lm3630a_i2c_driver);
+
+MODULE_DESCRIPTION("Texas Instruments Backlight driver for LM3630A");
+MODULE_AUTHOR("Daniel Jeong <gshark.jeong@gmail.com>");
+MODULE_AUTHOR("LDD MLP <ldd-mlp@list.ti.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
index 053964da8dd3..6fd60adf922e 100644
--- a/drivers/video/backlight/lm3639_bl.c
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -76,10 +76,13 @@ static int lm3639_chip_init(struct lm3639_chip_data *pchip)
                 goto out;
 
         /* output pins config. */
-        if (!pdata->init_brt_led)
-                reg_val = pdata->fled_pins | pdata->bled_pins;
-        else
-                reg_val = pdata->fled_pins | pdata->bled_pins | 0x01;
+        if (!pdata->init_brt_led) {
+                reg_val = pdata->fled_pins;
+                reg_val |= pdata->bled_pins;
+        } else {
+                reg_val = pdata->fled_pins;
+                reg_val |= pdata->bled_pins | 0x01;
+        }
 
         ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x79, reg_val);
         if (ret < 0)
@@ -304,7 +307,7 @@ static int lm3639_probe(struct i2c_client *client,
 {
         int ret;
         struct lm3639_chip_data *pchip;
-        struct lm3639_platform_data *pdata = client->dev.platform_data;
+        struct lm3639_platform_data *pdata = dev_get_platdata(&client->dev);
         struct backlight_properties props;
 
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 4eec47261cd3..de8832504f68 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -128,7 +128,7 @@ static int lms283gf05_power_set(struct lcd_device *ld, int power)
 {
         struct lms283gf05_state *st = lcd_get_data(ld);
         struct spi_device *spi = st->spi;
-        struct lms283gf05_pdata *pdata = spi->dev.platform_data;
+        struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev);
 
         if (power <= FB_BLANK_NORMAL) {
                 if (pdata)
@@ -153,7 +153,7 @@ static struct lcd_ops lms_ops = {
 static int lms283gf05_probe(struct spi_device *spi)
 {
         struct lms283gf05_state *st;
-        struct lms283gf05_pdata *pdata = spi->dev.platform_data;
+        struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev);
         struct lcd_device *ld;
         int ret = 0;
 
@@ -173,7 +173,8 @@ static int lms283gf05_probe(struct spi_device *spi)
                 return -ENOMEM;
         }
 
-        ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
+        ld = devm_lcd_device_register(&spi->dev, "lms283gf05", &spi->dev, st,
+                                        &lms_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -190,22 +191,12 @@ static int lms283gf05_probe(struct spi_device *spi)
         return 0;
 }
 
-static int lms283gf05_remove(struct spi_device *spi)
-{
-        struct lms283gf05_state *st = spi_get_drvdata(spi);
-
-        lcd_device_unregister(st->ld);
-
-        return 0;
-}
-
 static struct spi_driver lms283gf05_driver = {
         .driver = {
                 .name   = "lms283gf05",
                 .owner  = THIS_MODULE,
         },
         .probe          = lms283gf05_probe,
-        .remove         = lms283gf05_remove,
 };
 
 module_spi_driver(lms283gf05_driver);
diff --git a/drivers/video/backlight/lms501kf03.c b/drivers/video/backlight/lms501kf03.c
index cf01b9ac8131..77258b7b04be 100644
--- a/drivers/video/backlight/lms501kf03.c
+++ b/drivers/video/backlight/lms501kf03.c
@@ -344,14 +344,14 @@ static int lms501kf03_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = spi->dev.platform_data;
+        lcd->lcd_pd = dev_get_platdata(&spi->dev);
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL\n");
                 return -EINVAL;
         }
 
-        ld = lcd_device_register("lms501kf03", &spi->dev, lcd,
-                                &lms501kf03_lcd_ops);
+        ld = devm_lcd_device_register(&spi->dev, "lms501kf03", &spi->dev, lcd,
+                                        &lms501kf03_lcd_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -382,8 +382,6 @@ static int lms501kf03_remove(struct spi_device *spi)
         struct lms501kf03 *lcd = spi_get_drvdata(spi);
 
         lms501kf03_power(lcd, FB_BLANK_POWERDOWN);
-        lcd_device_unregister(lcd->ld);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index c0b41f13bd4a..cae80d555e84 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -26,13 +26,15 @@
 #define LP8556_EPROM_START              0xA0
 #define LP8556_EPROM_END                0xAF
 
-/* LP8557 Registers */
+/* LP8555/7 Registers */
 #define LP8557_BL_CMD                   0x00
 #define LP8557_BL_MASK                  0x01
 #define LP8557_BL_ON                    0x01
 #define LP8557_BL_OFF                   0x00
 #define LP8557_BRIGHTNESS_CTRL          0x04
 #define LP8557_CONFIG                   0x10
+#define LP8555_EPROM_START              0x10
+#define LP8555_EPROM_END                0x7A
 #define LP8557_EPROM_START              0x10
 #define LP8557_EPROM_END                0x1E
 
@@ -111,6 +113,10 @@ static bool lp855x_is_valid_rom_area(struct lp855x *lp, u8 addr)
                 start = LP8556_EPROM_START;
                 end = LP8556_EPROM_END;
                 break;
+        case LP8555:
+                start = LP8555_EPROM_START;
+                end = LP8555_EPROM_END;
+                break;
         case LP8557:
                 start = LP8557_EPROM_START;
                 end = LP8557_EPROM_END;
@@ -165,9 +171,14 @@ static int lp855x_configure(struct lp855x *lp)
         struct lp855x_platform_data *pd = lp->pdata;
 
         switch (lp->chip_id) {
-        case LP8550 ... LP8556:
+        case LP8550:
+        case LP8551:
+        case LP8552:
+        case LP8553:
+        case LP8556:
                 lp->cfg = &lp855x_dev_cfg;
                 break;
+        case LP8555:
         case LP8557:
                 lp->cfg = &lp8557_dev_cfg;
                 break;
@@ -289,7 +300,7 @@ static int lp855x_backlight_register(struct lp855x *lp)
 
         props.brightness = pdata->initial_brightness;
 
-        bl = backlight_device_register(name, lp->dev, lp,
+        bl = devm_backlight_device_register(lp->dev, name, lp->dev, lp,
                                        &lp855x_bl_ops, &props);
         if (IS_ERR(bl))
                 return PTR_ERR(bl);
@@ -299,12 +310,6 @@ static int lp855x_backlight_register(struct lp855x *lp)
         return 0;
 }
 
-static void lp855x_backlight_unregister(struct lp855x *lp)
-{
-        if (lp->bl)
-                backlight_device_unregister(lp->bl);
-}
-
 static ssize_t lp855x_get_chip_id(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -394,7 +399,7 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node)
 static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 {
         struct lp855x *lp;
-        struct lp855x_platform_data *pdata = cl->dev.platform_data;
+        struct lp855x_platform_data *pdata = dev_get_platdata(&cl->dev);
         struct device_node *node = cl->dev.of_node;
         int ret;
 
@@ -403,7 +408,7 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
                 if (ret < 0)
                         return ret;
 
-                pdata = cl->dev.platform_data;
+                pdata = dev_get_platdata(&cl->dev);
         }
 
         if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
@@ -428,29 +433,24 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
         ret = lp855x_configure(lp);
         if (ret) {
                 dev_err(lp->dev, "device config err: %d", ret);
-                goto err_dev;
+                return ret;
         }
 
         ret = lp855x_backlight_register(lp);
         if (ret) {
                 dev_err(lp->dev,
                         "failed to register backlight. err: %d\n", ret);
-                goto err_dev;
+                return ret;
         }
 
         ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
         if (ret) {
                 dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
-                goto err_sysfs;
+                return ret;
         }
 
         backlight_update_status(lp->bl);
         return 0;
-
-err_sysfs:
-        lp855x_backlight_unregister(lp);
-err_dev:
-        return ret;
 }
 
 static int lp855x_remove(struct i2c_client *cl)
@@ -460,7 +460,6 @@ static int lp855x_remove(struct i2c_client *cl)
         lp->bl->props.brightness = 0;
         backlight_update_status(lp->bl);
         sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
-        lp855x_backlight_unregister(lp);
 
         return 0;
 }
@@ -470,6 +469,7 @@ static const struct of_device_id lp855x_dt_ids[] = {
         { .compatible = "ti,lp8551", },
         { .compatible = "ti,lp8552", },
         { .compatible = "ti,lp8553", },
+        { .compatible = "ti,lp8555", },
         { .compatible = "ti,lp8556", },
         { .compatible = "ti,lp8557", },
         { }
@@ -481,6 +481,7 @@ static const struct i2c_device_id lp855x_ids[] = {
         {"lp8551", LP8551},
         {"lp8552", LP8552},
         {"lp8553", LP8553},
+        {"lp8555", LP8555},
         {"lp8556", LP8556},
         {"lp8557", LP8557},
         { }
diff --git a/drivers/video/backlight/lp8788_bl.c b/drivers/video/backlight/lp8788_bl.c
index 980855ec9bb1..e49905d495dc 100644
--- a/drivers/video/backlight/lp8788_bl.c
+++ b/drivers/video/backlight/lp8788_bl.c
@@ -52,7 +52,7 @@ struct lp8788_bl {
         struct pwm_device *pwm;
 };
 
-struct lp8788_bl_config default_bl_config = {
+static struct lp8788_bl_config default_bl_config = {
         .bl_mode    = LP8788_BL_REGISTER_ONLY,
         .dim_mode   = LP8788_DIM_EXPONENTIAL,
         .full_scale = LP8788_FULLSCALE_1900uA,
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index ed1b39268131..383f550e165e 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -242,7 +242,8 @@ static int ltv350qv_probe(struct spi_device *spi)
         if (!lcd->buffer)
                 return -ENOMEM;
 
-        ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
+        ld = devm_lcd_device_register(&spi->dev, "ltv350qv", &spi->dev, lcd,
+                                        &ltv_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -250,15 +251,11 @@ static int ltv350qv_probe(struct spi_device *spi)
 
         ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
         if (ret)
-                goto out_unregister;
+                return ret;
 
         spi_set_drvdata(spi, lcd);
 
         return 0;
-
-out_unregister:
-        lcd_device_unregister(ld);
-        return ret;
 }
 
 static int ltv350qv_remove(struct spi_device *spi)
@@ -266,8 +263,6 @@ static int ltv350qv_remove(struct spi_device *spi)
         struct ltv350qv *lcd = spi_get_drvdata(spi);
 
         ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
-        lcd_device_unregister(lcd->ld);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c
index 498fd73d59b9..1802b2d1357d 100644
--- a/drivers/video/backlight/lv5207lp.c
+++ b/drivers/video/backlight/lv5207lp.c
@@ -93,7 +93,7 @@ static const struct backlight_ops lv5207lp_backlight_ops = {
 static int lv5207lp_probe(struct i2c_client *client,
                           const struct i2c_device_id *id)
 {
-        struct lv5207lp_platform_data *pdata = client->dev.platform_data;
+        struct lv5207lp_platform_data *pdata = dev_get_platdata(&client->dev);
         struct backlight_device *backlight;
         struct backlight_properties props;
         struct lv5207lp *lv;
@@ -124,9 +124,9 @@ static int lv5207lp_probe(struct i2c_client *client,
         props.brightness = clamp_t(unsigned int, pdata->def_value, 0,
                                    props.max_brightness);
 
-        backlight = backlight_device_register(dev_name(&client->dev),
-                                              &lv->client->dev, lv,
-                                              &lv5207lp_backlight_ops, &props);
+        backlight = devm_backlight_device_register(&client->dev,
+                                dev_name(&client->dev), &lv->client->dev,
+                                lv, &lv5207lp_backlight_ops, &props);
         if (IS_ERR(backlight)) {
                 dev_err(&client->dev, "failed to register backlight\n");
                 return PTR_ERR(backlight);
@@ -144,7 +144,6 @@ static int lv5207lp_remove(struct i2c_client *client)
 
         backlight->props.brightness = 0;
         backlight_update_status(backlight);
-        backlight_device_unregister(backlight);
 
         return 0;
 }
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 886e797f75f9..66fa08c920d2 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -163,7 +163,8 @@ static int max8925_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(struct backlight_properties));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
-        bl = backlight_device_register("max8925-backlight", &pdev->dev, data,
+        bl = devm_backlight_device_register(&pdev->dev, "max8925-backlight",
+                                        &pdev->dev, data,
                                         &max8925_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
@@ -188,20 +189,9 @@ static int max8925_backlight_probe(struct platform_device *pdev)
         }
         ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
         if (ret < 0)
-                goto out_brt;
+                return ret;
         backlight_update_status(bl);
         return 0;
-out_brt:
-        backlight_device_unregister(bl);
-        return ret;
-}
-
-static int max8925_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bl);
-        return 0;
 }
 
 static struct platform_driver max8925_backlight_driver = {
@@ -210,7 +200,6 @@ static struct platform_driver max8925_backlight_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = max8925_backlight_probe,
-        .remove         = max8925_backlight_remove,
 };
 
 module_platform_driver(max8925_backlight_driver);
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 812e22e35cab..ac11a4650c19 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -133,7 +133,7 @@ static int omapbl_probe(struct platform_device *pdev)
         struct backlight_properties props;
         struct backlight_device *dev;
         struct omap_backlight *bl;
-        struct omap_backlight_config *pdata = pdev->dev.platform_data;
+        struct omap_backlight_config *pdata = dev_get_platdata(&pdev->dev);
 
         if (!pdata)
                 return -ENXIO;
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 633b0a22fd64..2098c5d6efb9 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -120,8 +120,8 @@ static int pandora_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(props));
         props.max_brightness = MAX_USER_VALUE;
         props.type = BACKLIGHT_RAW;
-        bl = backlight_device_register(pdev->name, &pdev->dev,
-                        NULL, &pandora_backlight_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, pdev->name, &pdev->dev,
+                                        NULL, &pandora_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -145,20 +145,12 @@ static int pandora_backlight_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int pandora_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-        backlight_device_unregister(bl);
-        return 0;
-}
-
 static struct platform_driver pandora_backlight_driver = {
         .driver         = {
                 .name   = "pandora-backlight",
                 .owner  = THIS_MODULE,
         },
         .probe          = pandora_backlight_probe,
-        .remove         = pandora_backlight_remove,
 };
 
 module_platform_driver(pandora_backlight_driver);
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index 6ed76be18f19..b95d3b0aaffe 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -103,7 +103,7 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
 {
         struct pcf50633_bl *pcf_bl;
         struct device *parent = pdev->dev.parent;
-        struct pcf50633_platform_data *pcf50633_data = parent->platform_data;
+        struct pcf50633_platform_data *pcf50633_data = dev_get_platdata(parent);
         struct pcf50633_bl_platform_data *pdata = pcf50633_data->backlight_data;
         struct backlight_properties bl_props;
 
@@ -126,7 +126,8 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
 
         pcf_bl->pcf = dev_to_pcf50633(pdev->dev.parent);
 
-        pcf_bl->bl = backlight_device_register(pdev->name, &pdev->dev, pcf_bl,
+        pcf_bl->bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+                                                &pdev->dev, pcf_bl,
                                                 &pcf50633_bl_ops, &bl_props);
 
         if (IS_ERR(pcf_bl->bl))
@@ -147,18 +148,8 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int pcf50633_bl_remove(struct platform_device *pdev)
-{
-        struct pcf50633_bl *pcf_bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(pcf_bl->bl);
-
-        return 0;
-}
-
 static struct platform_driver pcf50633_bl_driver = {
         .probe =        pcf50633_bl_probe,
-        .remove =       pcf50633_bl_remove,
         .driver = {
                 .name = "pcf50633-backlight",
         },
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index 056836706708..d01884d4f1bf 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -80,7 +80,7 @@ static int platform_lcd_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         int err;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(dev, "no platform data supplied\n");
                 return -EINVAL;
@@ -101,30 +101,17 @@ static int platform_lcd_probe(struct platform_device *pdev)
 
         plcd->us = dev;
         plcd->pdata = pdata;
-        plcd->lcd = lcd_device_register(dev_name(dev), dev,
-                                        plcd, &platform_lcd_ops);
+        plcd->lcd = devm_lcd_device_register(&pdev->dev, dev_name(dev), dev,
+                                                plcd, &platform_lcd_ops);
         if (IS_ERR(plcd->lcd)) {
                 dev_err(dev, "cannot register lcd device\n");
-                err = PTR_ERR(plcd->lcd);
-                goto err;
+                return PTR_ERR(plcd->lcd);
         }
 
         platform_set_drvdata(pdev, plcd);
         platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);
 
         return 0;
-
- err:
-        return err;
-}
-
-static int platform_lcd_remove(struct platform_device *pdev)
-{
-        struct platform_lcd *plcd = platform_get_drvdata(pdev);
-
-        lcd_device_unregister(plcd->lcd);
-
-        return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -168,7 +155,6 @@ static struct platform_driver platform_lcd_driver = {
                 .of_match_table = of_match_ptr(platform_lcd_of_match),
         },
         .probe          = platform_lcd_probe,
-        .remove         = platform_lcd_remove,
 };
 
 module_platform_driver(platform_lcd_driver);
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 1fea627394d7..36db5d98dd2f 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -163,7 +163,7 @@ static int pwm_backlight_parse_dt(struct device *dev,
 
 static int pwm_backlight_probe(struct platform_device *pdev)
 {
-        struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
+        struct platform_pwm_backlight_data *data = dev_get_platdata(&pdev->dev);
         struct platform_pwm_backlight_data defdata;
         struct backlight_properties props;
         struct backlight_device *bl;
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index b37bb1854bf4..510a1bcf76f1 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -735,13 +735,14 @@ static int s6e63m0_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = spi->dev.platform_data;
+        lcd->lcd_pd = dev_get_platdata(&spi->dev);
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
                 return -EINVAL;
         }
 
-        ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops);
+        ld = devm_lcd_device_register(&spi->dev, "s6e63m0", &spi->dev, lcd,
+                                &s6e63m0_lcd_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -751,12 +752,11 @@ static int s6e63m0_probe(struct spi_device *spi)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
 
-        bd = backlight_device_register("s6e63m0bl-bl", &spi->dev, lcd,
-                &s6e63m0_backlight_ops, &props);
-        if (IS_ERR(bd)) {
-                ret =  PTR_ERR(bd);
-                goto out_lcd_unregister;
-        }
+        bd = devm_backlight_device_register(&spi->dev, "s6e63m0bl-bl",
+                                        &spi->dev, lcd, &s6e63m0_backlight_ops,
+                                        &props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
 
         bd->props.brightness = MAX_BRIGHTNESS;
         lcd->bd = bd;
@@ -798,10 +798,6 @@ static int s6e63m0_probe(struct spi_device *spi)
         dev_info(&spi->dev, "s6e63m0 panel driver has been probed.\n");
 
         return 0;
-
-out_lcd_unregister:
-        lcd_device_unregister(ld);
-        return ret;
 }
 
 static int s6e63m0_remove(struct spi_device *spi)
@@ -811,8 +807,6 @@ static int s6e63m0_remove(struct spi_device *spi)
         s6e63m0_power(lcd, FB_BLANK_POWERDOWN);
         device_remove_file(&spi->dev, &dev_attr_gamma_table);
         device_remove_file(&spi->dev, &dev_attr_gamma_mode);
-        backlight_device_unregister(lcd->bd);
-        lcd_device_unregister(lcd->ld);
 
         return 0;
 }
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 18cdf466d50a..908016fc5829 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -338,7 +338,7 @@ static int tdo24m_probe(struct spi_device *spi)
         enum tdo24m_model model;
         int err;
 
-        pdata = spi->dev.platform_data;
+        pdata = dev_get_platdata(&spi->dev);
         if (pdata)
                 model = pdata->model;
         else
@@ -385,21 +385,17 @@ static int tdo24m_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        lcd->lcd_dev = lcd_device_register("tdo24m", &spi->dev,
-                                        lcd, &tdo24m_ops);
+        lcd->lcd_dev = devm_lcd_device_register(&spi->dev, "tdo24m", &spi->dev,
+                                                lcd, &tdo24m_ops);
         if (IS_ERR(lcd->lcd_dev))
                 return PTR_ERR(lcd->lcd_dev);
 
         spi_set_drvdata(spi, lcd);
         err = tdo24m_power(lcd, FB_BLANK_UNBLANK);
         if (err)
-                goto out_unregister;
+                return err;
 
         return 0;
-
-out_unregister:
-        lcd_device_unregister(lcd->lcd_dev);
-        return err;
 }
 
 static int tdo24m_remove(struct spi_device *spi)
@@ -407,8 +403,6 @@ static int tdo24m_remove(struct spi_device *spi)
         struct tdo24m *lcd = spi_get_drvdata(spi);
 
         tdo24m_power(lcd, FB_BLANK_POWERDOWN);
-        lcd_device_unregister(lcd->lcd_dev);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 9df66ac68b34..b8db9338cacd 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -38,7 +38,7 @@ struct tosa_bl_data {
 
 static void tosa_bl_set_backlight(struct tosa_bl_data *data, int brightness)
 {
-        struct spi_device *spi = data->i2c->dev.platform_data;
+        struct spi_device *spi = dev_get_platdata(&data->i2c->dev);
 
         i2c_smbus_write_byte_data(data->i2c, DAC_CH1, data->comadj);
 
diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/backlight/tps65217_bl.c
index 05782312aeb3..cbba37e6836e 100644
--- a/drivers/video/backlight/tps65217_bl.c
+++ b/drivers/video/backlight/tps65217_bl.c
@@ -287,12 +287,11 @@ static int tps65217_bl_probe(struct platform_device *pdev)
                 if (IS_ERR(pdata))
                         return PTR_ERR(pdata);
         } else {
-                if (!pdev->dev.platform_data) {
+                pdata = dev_get_platdata(&pdev->dev);
+                if (!pdata) {
                         dev_err(&pdev->dev, "no platform data provided\n");
                         return -EINVAL;
                 }
-
-                pdata = pdev->dev.platform_data;
         }
 
         tps65217_bl = devm_kzalloc(&pdev->dev, sizeof(*tps65217_bl),
@@ -314,7 +313,7 @@ static int tps65217_bl_probe(struct platform_device *pdev)
         bl_props.type = BACKLIGHT_RAW;
         bl_props.max_brightness = 100;
 
-        tps65217_bl->bl = backlight_device_register(pdev->name,
+        tps65217_bl->bl = devm_backlight_device_register(&pdev->dev, pdev->name,
                                                 tps65217_bl->dev, tps65217_bl,
                                                 &tps65217_bl_ops, &bl_props);
         if (IS_ERR(tps65217_bl->bl)) {
@@ -330,18 +329,8 @@ static int tps65217_bl_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int tps65217_bl_remove(struct platform_device *pdev)
-{
-        struct tps65217_bl *tps65217_bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(tps65217_bl->bl);
-
-        return 0;
-}
-
 static struct platform_driver tps65217_bl_driver = {
         .probe          = tps65217_bl_probe,
-        .remove         = tps65217_bl_remove,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "tps65217-bl",
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 9e5517a3a52b..8b9455e93069 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -123,7 +123,7 @@ static const struct backlight_ops wm831x_backlight_ops = {
 static int wm831x_backlight_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
-        struct wm831x_pdata *wm831x_pdata;
+        struct wm831x_pdata *wm831x_pdata = dev_get_platdata(pdev->dev.parent);
         struct wm831x_backlight_pdata *pdata;
         struct wm831x_backlight_data *data;
         struct backlight_device *bl;
@@ -131,12 +131,10 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         int ret, i, max_isel, isink_reg, dcdc_cfg;
 
         /* We need platform data */
-        if (pdev->dev.parent->platform_data) {
-                wm831x_pdata = pdev->dev.parent->platform_data;
+        if (wm831x_pdata)
                 pdata = wm831x_pdata->backlight;
-        } else {
+        else
                 pdata = NULL;
-        }
 
         if (!pdata) {
                 dev_err(&pdev->dev, "No platform data supplied\n");
@@ -197,8 +195,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_isel;
-        bl = backlight_device_register("wm831x", &pdev->dev, data,
-                                       &wm831x_backlight_ops, &props);
+        bl = devm_backlight_device_register(&pdev->dev, "wm831x", &pdev->dev,
+                                        data, &wm831x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 return PTR_ERR(bl);
@@ -216,21 +214,12 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int wm831x_backlight_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bl = platform_get_drvdata(pdev);
-
-        backlight_device_unregister(bl);
-        return 0;
-}
-
 static struct platform_driver wm831x_backlight_driver = {
         .driver         = {
                 .name   = "wm831x-backlight",
                 .owner  = THIS_MODULE,
         },
         .probe          = wm831x_backlight_probe,
-        .remove         = wm831x_backlight_remove,
 };
 
 module_platform_driver(wm831x_backlight_driver);