Merge branch 'akpm' (Andrew's patch-bomb)

Merge patches through Andrew Morton:
 "180 patches - err 181 - listed below:

   - most of MM.  I held back the (large) "memcg: add hugetlb extension"
     series because a bunfight has recently broken out.

   - leds.  After this, Bryan Wu will be handling drivers/leds/

   - backlight

   - lib/

   - rtc"

* emailed from Andrew Morton <akpm@linux-foundation.org>: (181 patches)
  drivers/rtc/rtc-s3c.c: fix compiler warning
  drivers/rtc/rtc-tegra.c: clean up probe/remove routines
  drivers/rtc/rtc-pl031.c: remove RTC timer interrupt handling
  drivers/rtc/rtc-lpc32xx.c: add device tree support
  drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
  rtc: ds1307: add trickle charger support
  rtc: ds1307: remove superfluous initialization
  rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
  drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
  rtc: add ioctl to get/clear battery low voltage status
  drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
  rtc/spear: add Device Tree probing capability
  lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
  radix-tree: fix preload vector size
  spinlock_debug: print kallsyms name for lock
  vsprintf: fix %ps on non symbols when using kallsyms
  lib/bitmap.c: fix documentation for scnprintf() functions
  lib/string_helpers.c: make arrays static
  lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
  ...

29 files changed, 580 insertions, 186 deletions

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index af16884491ed..fa2b03750316 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -184,6 +184,18 @@ config BACKLIGHT_GENERIC
           known as the Corgi backlight driver. If you have a Sharp Zaurus
           SL-C7xx, SL-Cxx00 or SL-6000x say y.
 
+config BACKLIGHT_LM3533
+        tristate "Backlight Driver for LM3533"
+        depends on BACKLIGHT_CLASS_DEVICE
+        depends on MFD_LM3533
+        help
+          Say Y to enable the backlight driver for National Semiconductor / TI
+          LM3533 Lighting Power chips.
+
+          The backlights can be controlled directly, through PWM input, or by
+          the ambient-light-sensor interface. The chip supports 256 brightness
+          levels.
+
 config BACKLIGHT_LOCOMO
         tristate "Sharp LOCOMO LCD/Backlight Driver"
         depends on SHARP_LOCOMO
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 36855ae887d6..a2ac9cfbaf6b 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_BACKLIGHT_EP93XX)	+= ep93xx_bl.o
 obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)   += jornada720_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
+obj-$(CONFIG_BACKLIGHT_LM3533)  += lm3533_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
 obj-$(CONFIG_BACKLIGHT_LP855X)  += lp855x_bl.o
 obj-$(CONFIG_BACKLIGHT_OMAP1)   += omap1_bl.o
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index 4911ea7989c8..df5db99af23d 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -160,7 +160,7 @@ static ssize_t adp5520_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -214,7 +214,7 @@ static ssize_t adp5520_bl_daylight_max_store(struct device *dev,
         struct adp5520_bl *data = dev_get_drvdata(dev);
         int ret;
 
-        ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 550dbf0bb896..77d1fdba597f 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -222,7 +222,8 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
         struct led_info *cur_led;
         int ret, i;
 
-        led = kzalloc(sizeof(*led) * pdata->num_leds, GFP_KERNEL);
+        led = devm_kzalloc(&client->dev, sizeof(*led) * pdata->num_leds,
+                                GFP_KERNEL);
         if (led == NULL) {
                 dev_err(&client->dev, "failed to alloc memory\n");
                 return -ENOMEM;
@@ -236,7 +237,7 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
 
         if (ret) {
                 dev_err(&client->dev, "failed to write\n");
-                goto err_free;
+                return ret;
         }
 
         for (i = 0; i < pdata->num_leds; ++i) {
@@ -291,9 +292,6 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
                 cancel_work_sync(&led[i].work);
         }
 
- err_free:
-        kfree(led);
-
         return ret;
 }
 
@@ -309,7 +307,6 @@ static int __devexit adp8860_led_remove(struct i2c_client *client)
                 cancel_work_sync(&data->led[i].work);
         }
 
-        kfree(data->led);
         return 0;
 }
 #else
@@ -451,7 +448,7 @@ static ssize_t adp8860_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -501,7 +498,7 @@ static ssize_t adp8860_bl_l1_daylight_max_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct adp8860_bl *data = dev_get_drvdata(dev);
-        int ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret)
                 return ret;
 
@@ -608,7 +605,7 @@ static ssize_t adp8860_bl_ambient_light_zone_store(struct device *dev,
         uint8_t reg_val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -675,13 +672,13 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                 return -EINVAL;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
         ret = adp8860_read(client, ADP8860_MFDVID, &reg_val);
         if (ret < 0)
-                goto out2;
+                return ret;
 
         switch (ADP8860_MANID(reg_val)) {
         case ADP8863_MANUFID:
@@ -694,8 +691,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                 break;
         default:
                 dev_err(&client->dev, "failed to probe\n");
-                ret = -ENODEV;
-                goto out2;
+                return -ENODEV;
         }
 
         /* It's confirmed that the DEVID field is actually a REVID */
@@ -717,8 +713,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                         &client->dev, data, &adp8860_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
-                ret = PTR_ERR(bl);
-                goto out2;
+                return PTR_ERR(bl);
         }
 
         bl->props.brightness = ADP8860_MAX_BRIGHTNESS;
@@ -756,8 +751,6 @@ out:
                         &adp8860_bl_attr_group);
 out1:
         backlight_device_unregister(bl);
-out2:
-        kfree(data);
 
         return ret;
 }
@@ -776,7 +769,6 @@ static int __devexit adp8860_remove(struct i2c_client *client)
                         &adp8860_bl_attr_group);
 
         backlight_device_unregister(data->bl);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 9be58c6f18f1..edf7f91c8e61 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -244,8 +244,8 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
         struct led_info *cur_led;
         int ret, i;
 
-
-        led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
+        led = devm_kzalloc(&client->dev, pdata->num_leds * sizeof(*led),
+                                GFP_KERNEL);
         if (led == NULL) {
                 dev_err(&client->dev, "failed to alloc memory\n");
                 return -ENOMEM;
@@ -253,17 +253,17 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
 
         ret = adp8870_write(client, ADP8870_ISCLAW, pdata->led_fade_law);
         if (ret)
-                goto err_free;
+                return ret;
 
         ret = adp8870_write(client, ADP8870_ISCT1,
                         (pdata->led_on_time & 0x3) << 6);
         if (ret)
-                goto err_free;
+                return ret;
 
         ret = adp8870_write(client, ADP8870_ISCF,
                         FADE_VAL(pdata->led_fade_in, pdata->led_fade_out));
         if (ret)
-                goto err_free;
+                return ret;
 
         for (i = 0; i < pdata->num_leds; ++i) {
                 cur_led = &pdata->leds[i];
@@ -317,9 +317,6 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
                 cancel_work_sync(&led[i].work);
         }
 
- err_free:
-        kfree(led);
-
         return ret;
 }
 
@@ -335,7 +332,6 @@ static int __devexit adp8870_led_remove(struct i2c_client *client)
                 cancel_work_sync(&data->led[i].work);
         }
 
-        kfree(data->led);
         return 0;
 }
 #else
@@ -572,7 +568,7 @@ static ssize_t adp8870_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -652,7 +648,7 @@ static ssize_t adp8870_bl_l1_daylight_max_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct adp8870_bl *data = dev_get_drvdata(dev);
-        int ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret)
                 return ret;
 
@@ -794,7 +790,7 @@ static ssize_t adp8870_bl_ambient_light_zone_store(struct device *dev,
         uint8_t reg_val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -874,7 +870,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -894,8 +890,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                         &client->dev, data, &adp8870_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
-                ret = PTR_ERR(bl);
-                goto out2;
+                return PTR_ERR(bl);
         }
 
         data->bl = bl;
@@ -930,8 +925,6 @@ out:
                         &adp8870_bl_attr_group);
 out1:
         backlight_device_unregister(bl);
-out2:
-        kfree(data);
 
         return ret;
 }
@@ -950,7 +943,6 @@ static int __devexit adp8870_remove(struct i2c_client *client)
                         &adp8870_bl_attr_group);
 
         backlight_device_unregister(data->bl);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 7bdadc790117..3729238e7096 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -482,7 +482,7 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct ams369fg06), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ams369fg06), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -492,7 +492,7 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -501,15 +501,13 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         lcd->lcd_pd = spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         ld = lcd_device_register("ams369fg06", &spi->dev, lcd,
                 &ams369fg06_lcd_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_lcd;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
 
         lcd->ld = ld;
 
@@ -547,8 +545,6 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
 
 out_lcd_unregister:
         lcd_device_unregister(ld);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -559,7 +555,6 @@ static int __devexit ams369fg06_remove(struct spi_device *spi)
         ams369fg06_power(lcd, FB_BLANK_POWERDOWN);
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd);
 
         return 0;
 }
@@ -619,7 +614,6 @@ static void ams369fg06_shutdown(struct spi_device *spi)
 static struct spi_driver ams369fg06_driver = {
         .driver = {
                 .name   = "ams369fg06",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ams369fg06_probe,
diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c
index a523b255e124..9dc73ac3709a 100644
--- a/drivers/video/backlight/apple_bl.c
+++ b/drivers/video/backlight/apple_bl.c
@@ -16,6 +16,8 @@
  *  get at the firmware code in order to figure out what it's actually doing.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -25,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/atomic.h>
+#include <linux/apple_bl.h>
 
 static struct backlight_device *apple_backlight_device;
 
@@ -39,8 +42,6 @@ struct hw_data {
 
 static const struct hw_data *hw_data;
 
-#define DRIVER "apple_backlight: "
-
 /* Module parameters. */
 static int debug;
 module_param_named(debug, debug, int, 0644);
@@ -60,8 +61,7 @@ static int intel_chipset_send_intensity(struct backlight_device *bd)
         int intensity = bd->props.brightness;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                       intensity);
+                pr_debug("setting brightness to %d\n", intensity);
 
         intel_chipset_set_brightness(intensity);
         return 0;
@@ -76,8 +76,7 @@ static int intel_chipset_get_intensity(struct backlight_device *bd)
         intensity = inb(0xb3) >> 4;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                       intensity);
+                pr_debug("read brightness of %d\n", intensity);
 
         return intensity;
 }
@@ -107,8 +106,7 @@ static int nvidia_chipset_send_intensity(struct backlight_device *bd)
         int intensity = bd->props.brightness;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                       intensity);
+                pr_debug("setting brightness to %d\n", intensity);
 
         nvidia_chipset_set_brightness(intensity);
         return 0;
@@ -123,8 +121,7 @@ static int nvidia_chipset_get_intensity(struct backlight_device *bd)
         intensity = inb(0x52f) >> 4;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                       intensity);
+                pr_debug("read brightness of %d\n", intensity);
 
         return intensity;
 }
@@ -149,7 +146,7 @@ static int __devinit apple_bl_add(struct acpi_device *dev)
         host = pci_get_bus_and_slot(0, 0);
 
         if (!host) {
-                printk(KERN_ERR DRIVER "unable to find PCI host\n");
+                pr_err("unable to find PCI host\n");
                 return -ENODEV;
         }
 
@@ -161,7 +158,7 @@ static int __devinit apple_bl_add(struct acpi_device *dev)
         pci_dev_put(host);
 
         if (!hw_data) {
-                printk(KERN_ERR DRIVER "unknown hardware\n");
+                pr_err("unknown hardware\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bf5b1ece7160..297db2fa91f5 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -5,6 +5,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -123,7 +125,7 @@ static ssize_t backlight_store_power(struct device *dev,
         rc = -ENXIO;
         mutex_lock(&bd->ops_lock);
         if (bd->ops) {
-                pr_debug("backlight: set power to %lu\n", power);
+                pr_debug("set power to %lu\n", power);
                 if (bd->props.power != power) {
                         bd->props.power = power;
                         backlight_update_status(bd);
@@ -161,8 +163,7 @@ static ssize_t backlight_store_brightness(struct device *dev,
                 if (brightness > bd->props.max_brightness)
                         rc = -EINVAL;
                 else {
-                        pr_debug("backlight: set brightness to %lu\n",
-                                 brightness);
+                        pr_debug("set brightness to %lu\n", brightness);
                         bd->props.brightness = brightness;
                         backlight_update_status(bd);
                         rc = count;
@@ -378,8 +379,8 @@ static int __init backlight_class_init(void)
 {
         backlight_class = class_create(THIS_MODULE, "backlight");
         if (IS_ERR(backlight_class)) {
-                printk(KERN_WARNING "Unable to create backlight class; errno = %ld\n",
-                                PTR_ERR(backlight_class));
+                pr_warn("Unable to create backlight class; errno = %ld\n",
+                        PTR_ERR(backlight_class));
                 return PTR_ERR(backlight_class);
         }
 
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 6dab13fe562e..23d732677ba1 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -544,7 +544,7 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        lcd = kzalloc(sizeof(struct corgi_lcd), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct corgi_lcd), GFP_KERNEL);
         if (!lcd) {
                 dev_err(&spi->dev, "failed to allocate memory\n");
                 return -ENOMEM;
@@ -554,10 +554,9 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
 
         lcd->lcd_dev = lcd_device_register("corgi_lcd", &spi->dev,
                                         lcd, &corgi_lcd_ops);
-        if (IS_ERR(lcd->lcd_dev)) {
-                ret = PTR_ERR(lcd->lcd_dev);
-                goto err_free_lcd;
-        }
+        if (IS_ERR(lcd->lcd_dev))
+                return PTR_ERR(lcd->lcd_dev);
+
         lcd->power = FB_BLANK_POWERDOWN;
         lcd->mode = (pdata) ? pdata->init_mode : CORGI_LCD_MODE_VGA;
 
@@ -591,8 +590,6 @@ err_unregister_bl:
         backlight_device_unregister(lcd->bl_dev);
 err_unregister_lcd:
         lcd_device_unregister(lcd->lcd_dev);
-err_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -613,7 +610,6 @@ static int __devexit corgi_lcd_remove(struct spi_device *spi)
 
         corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->lcd_dev);
-        kfree(lcd);
 
         return 0;
 }
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 22489eb5f3e0..37bae801e23b 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -27,6 +27,8 @@
  *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -180,14 +182,13 @@ static int cr_backlight_probe(struct platform_device *pdev)
         lpc_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                         CRVML_DEVICE_LPC, NULL);
         if (!lpc_dev) {
-                printk("INTEL CARILLO RANCH LPC not found.\n");
+                pr_err("INTEL CARILLO RANCH LPC not found.\n");
                 return -ENODEV;
         }
 
         pci_read_config_byte(lpc_dev, CRVML_REG_GPIOEN, &dev_en);
         if (!(dev_en & CRVML_GPIOEN_BIT)) {
-                printk(KERN_ERR
-                       "Carillo Ranch GPIO device was not enabled.\n");
+                pr_err("Carillo Ranch GPIO device was not enabled.\n");
                 pci_dev_put(lpc_dev);
                 return -ENODEV;
         }
@@ -270,7 +271,7 @@ static int __init cr_backlight_init(void)
                 return PTR_ERR(crp);
         }
 
-        printk("Carillo Ranch Backlight Driver Initialized.\n");
+        pr_info("Carillo Ranch Backlight Driver Initialized.\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 30e19681a30b..573c7ece0fde 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -136,6 +136,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
                 da903x_write(data->da903x_dev, DA9034_WLED_CONTROL2,
                                 DA9034_WLED_ISET(pdata->output_current));
 
+        memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_brightness;
         bl = backlight_device_register(pdev->name, data->da903x_dev, data,
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 9ce6170c1860..8c660fcd250d 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -106,7 +108,7 @@ static int genericbl_probe(struct platform_device *pdev)
 
         generic_backlight_device = bd;
 
-        printk("Generic Backlight Driver Initialized.\n");
+        pr_info("Generic Backlight Driver Initialized.\n");
         return 0;
 }
 
@@ -120,7 +122,7 @@ static int genericbl_remove(struct platform_device *pdev)
 
         backlight_device_unregister(bd);
 
-        printk("Generic Backlight Driver Unloaded\n");
+        pr_info("Generic Backlight Driver Unloaded\n");
         return 0;
 }
 
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 5118a9f029ab..6c9399341bcf 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -220,7 +220,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
         /* allocate and initialse our state */
 
-        ili = kzalloc(sizeof(struct ili9320), GFP_KERNEL);
+        ili = devm_kzalloc(&spi->dev, sizeof(struct ili9320), GFP_KERNEL);
         if (ili == NULL) {
                 dev_err(dev, "no memory for device\n");
                 return -ENOMEM;
@@ -240,8 +240,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
         lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);
         if (IS_ERR(lcd)) {
                 dev_err(dev, "failed to register lcd device\n");
-                ret = PTR_ERR(lcd);
-                goto err_free;
+                return PTR_ERR(lcd);
         }
 
         ili->lcd = lcd;
@@ -259,9 +258,6 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
  err_unregister:
         lcd_device_unregister(lcd);
 
- err_free:
-        kfree(ili);
-
         return ret;
 }
 
@@ -272,7 +268,6 @@ int __devexit ili9320_remove(struct ili9320 *ili)
         ili9320_power(ili, FB_BLANK_POWERDOWN);
 
         lcd_device_unregister(ili->lcd);
-        kfree(ili);
 
         return 0;
 }
diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 2f8af5d786ab..16f593b64427 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/backlight.h>
 #include <linux/device.h>
 #include <linux/fb.h>
@@ -38,7 +40,7 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
         ret = jornada_ssp_byte(GETBRIGHTNESS);
 
         if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) {
-                printk(KERN_ERR "bl : get brightness timeout\n");
+                pr_err("get brightness timeout\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         } else /* exchange txdummy for value */
@@ -59,7 +61,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
         if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
                 ret = jornada_ssp_byte(BRIGHTNESSOFF);
                 if (ret != TXDUMMY) {
-                        printk(KERN_INFO "bl : brightness off timeout\n");
+                        pr_info("brightness off timeout\n");
                         /* turn off backlight */
                         PPSR &= ~PPC_LDD1;
                         PPDR |= PPC_LDD1;
@@ -70,7 +72,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
 
                 /* send command to our mcu */
                 if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
-                        printk(KERN_INFO "bl : failed to set brightness\n");
+                        pr_info("failed to set brightness\n");
                         ret = -ETIMEDOUT;
                         goto out;
                 }
@@ -81,7 +83,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                    but due to physical layout it is equal to 0, so we simply
                    invert the value (MAX VALUE - NEW VALUE). */
                 if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) {
-                        printk(KERN_ERR "bl : set brightness failed\n");
+                        pr_err("set brightness failed\n");
                         ret = -ETIMEDOUT;
                 }
 
@@ -113,7 +115,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
         if (IS_ERR(bd)) {
                 ret = PTR_ERR(bd);
-                printk(KERN_ERR "bl : failed to register device, err=%x\n", ret);
+                pr_err("failed to register device, err=%x\n", ret);
                 return ret;
         }
 
@@ -125,7 +127,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
         jornada_bl_update_status(bd);
 
         platform_set_drvdata(pdev, bd);
-        printk(KERN_INFO "HP Jornada 700 series backlight driver\n");
+        pr_info("HP Jornada 700 series backlight driver\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index 22d231a17e3c..635b30523fd5 100644
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/fb.h>
 #include <linux/kernel.h>
@@ -44,7 +46,7 @@ static int jornada_lcd_get_contrast(struct lcd_device *dev)
         jornada_ssp_start();
 
         if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) {
-                printk(KERN_ERR "lcd: get contrast failed\n");
+                pr_err("get contrast failed\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         } else {
@@ -65,7 +67,7 @@ static int jornada_lcd_set_contrast(struct lcd_device *dev, int value)
 
         /* push the new value */
         if (jornada_ssp_byte(value) != TXDUMMY) {
-                printk(KERN_ERR "lcd : set contrast failed\n");
+                pr_err("set contrast failed\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         }
@@ -103,7 +105,7 @@ static int jornada_lcd_probe(struct platform_device *pdev)
 
         if (IS_ERR(lcd_device)) {
                 ret = PTR_ERR(lcd_device);
-                printk(KERN_ERR "lcd : failed to register device\n");
+                pr_err("failed to register device\n");
                 return ret;
         }
 
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 6022b67285ec..40f606a86093 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -11,6 +11,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -159,7 +161,8 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        priv = kzalloc(sizeof(struct l4f00242t03_priv), GFP_KERNEL);
+        priv = devm_kzalloc(&spi->dev, sizeof(struct l4f00242t03_priv),
+                                GFP_KERNEL);
 
         if (priv == NULL) {
                 dev_err(&spi->dev, "No memory for this device.\n");
@@ -177,7 +180,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
         if (ret) {
                 dev_err(&spi->dev,
                         "Unable to get the lcd l4f00242t03 reset gpio.\n");
-                goto err;
+                return ret;
         }
 
         ret = gpio_request_one(pdata->data_enable_gpio, GPIOF_OUT_INIT_LOW,
@@ -185,7 +188,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
         if (ret) {
                 dev_err(&spi->dev,
                         "Unable to get the lcd l4f00242t03 data en gpio.\n");
-                goto err2;
+                goto err;
         }
 
         priv->io_reg = regulator_get(&spi->dev, "vdd");
@@ -193,7 +196,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 ret = PTR_ERR(priv->io_reg);
                 dev_err(&spi->dev, "%s: Unable to get the IO regulator\n",
                        __func__);
-                goto err3;
+                goto err2;
         }
 
         priv->core_reg = regulator_get(&spi->dev, "vcore");
@@ -201,14 +204,14 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 ret = PTR_ERR(priv->core_reg);
                 dev_err(&spi->dev, "%s: Unable to get the core regulator\n",
                        __func__);
-                goto err4;
+                goto err3;
         }
 
         priv->ld = lcd_device_register("l4f00242t03",
                                         &spi->dev, priv, &l4f_ops);
         if (IS_ERR(priv->ld)) {
                 ret = PTR_ERR(priv->ld);
-                goto err5;
+                goto err4;
         }
 
         /* Init the LCD */
@@ -220,16 +223,14 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
 
         return 0;
 
-err5:
-        regulator_put(priv->core_reg);
 err4:
-        regulator_put(priv->io_reg);
+        regulator_put(priv->core_reg);
 err3:
-        gpio_free(pdata->data_enable_gpio);
+        regulator_put(priv->io_reg);
 err2:
-        gpio_free(pdata->reset_gpio);
+        gpio_free(pdata->data_enable_gpio);
 err:
-        kfree(priv);
+        gpio_free(pdata->reset_gpio);
 
         return ret;
 }
@@ -250,8 +251,6 @@ static int __devexit l4f00242t03_remove(struct spi_device *spi)
         regulator_put(priv->io_reg);
         regulator_put(priv->core_reg);
 
-        kfree(priv);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 79c1b0d609a8..a5d0d024bb92 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -5,6 +5,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -32,6 +34,8 @@ static int fb_notifier_callback(struct notifier_block *self,
         case FB_EVENT_BLANK:
         case FB_EVENT_MODE_CHANGE:
         case FB_EVENT_MODE_CHANGE_ALL:
+        case FB_EARLY_EVENT_BLANK:
+        case FB_R_EARLY_EVENT_BLANK:
                 break;
         default:
                 return 0;
@@ -46,6 +50,14 @@ static int fb_notifier_callback(struct notifier_block *self,
                 if (event == FB_EVENT_BLANK) {
                         if (ld->ops->set_power)
                                 ld->ops->set_power(ld, *(int *)evdata->data);
+                } else if (event == FB_EARLY_EVENT_BLANK) {
+                        if (ld->ops->early_set_power)
+                                ld->ops->early_set_power(ld,
+                                                *(int *)evdata->data);
+                } else if (event == FB_R_EARLY_EVENT_BLANK) {
+                        if (ld->ops->r_early_set_power)
+                                ld->ops->r_early_set_power(ld,
+                                                *(int *)evdata->data);
                 } else {
                         if (ld->ops->set_mode)
                                 ld->ops->set_mode(ld, evdata->data);
@@ -106,7 +118,7 @@ static ssize_t lcd_store_power(struct device *dev,
 
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_power) {
-                pr_debug("lcd: set power to %lu\n", power);
+                pr_debug("set power to %lu\n", power);
                 ld->ops->set_power(ld, power);
                 rc = count;
         }
@@ -142,7 +154,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
 
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_contrast) {
-                pr_debug("lcd: set contrast to %lu\n", contrast);
+                pr_debug("set contrast to %lu\n", contrast);
                 ld->ops->set_contrast(ld, contrast);
                 rc = count;
         }
@@ -253,8 +265,8 @@ static int __init lcd_class_init(void)
 {
         lcd_class = class_create(THIS_MODULE, "lcd");
         if (IS_ERR(lcd_class)) {
-                printk(KERN_WARNING "Unable to create backlight class; errno = %ld\n",
-                                PTR_ERR(lcd_class));
+                pr_warn("Unable to create backlight class; errno = %ld\n",
+                        PTR_ERR(lcd_class));
                 return PTR_ERR(lcd_class);
         }
 
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index efd352be21ae..58f517fb7d40 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -707,7 +707,7 @@ static int ld9040_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ld9040), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -717,7 +717,7 @@ static int ld9040_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -726,7 +726,7 @@ static int ld9040_probe(struct spi_device *spi)
         lcd->lcd_pd = spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         mutex_init(&lcd->lock);
@@ -734,13 +734,13 @@ static int ld9040_probe(struct spi_device *spi)
         ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies);
         if (ret) {
                 dev_err(lcd->dev, "Failed to get regulators: %d\n", ret);
-                goto out_free_lcd;
+                return ret;
         }
 
         ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
         if (IS_ERR(ld)) {
                 ret = PTR_ERR(ld);
-                goto out_free_lcd;
+                goto out_free_regulator;
         }
 
         lcd->ld = ld;
@@ -782,10 +782,9 @@ static int ld9040_probe(struct spi_device *spi)
 
 out_unregister_lcd:
         lcd_device_unregister(lcd->ld);
-out_free_lcd:
+out_free_regulator:
         regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
 
-        kfree(lcd);
         return ret;
 }
 
@@ -797,7 +796,6 @@ static int __devexit ld9040_remove(struct spi_device *spi)
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
         regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
-        kfree(lcd);
 
         return 0;
 }
@@ -846,7 +844,6 @@ static void ld9040_shutdown(struct spi_device *spi)
 static struct spi_driver ld9040_driver = {
         .driver = {
                 .name   = "ld9040",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ld9040_probe,
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
new file mode 100644
index 000000000000..bebeb63607db
--- /dev/null
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -0,0 +1,423 @@
+/*
+ * lm3533-bl.c -- LM3533 Backlight driver
+ *
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * Author: Johan Hovold <jhovold@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under  the terms of the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/slab.h>
+
+#include <linux/mfd/lm3533.h>
+
+
+#define LM3533_HVCTRLBANK_COUNT         2
+#define LM3533_BL_MAX_BRIGHTNESS        255
+
+#define LM3533_REG_CTRLBANK_AB_BCONF    0x1a
+
+
+struct lm3533_bl {
+        struct lm3533 *lm3533;
+        struct lm3533_ctrlbank cb;
+        struct backlight_device *bd;
+        int id;
+};
+
+
+static inline int lm3533_bl_get_ctrlbank_id(struct lm3533_bl *bl)
+{
+        return bl->id;
+}
+
+static int lm3533_bl_update_status(struct backlight_device *bd)
+{
+        struct lm3533_bl *bl = bl_get_data(bd);
+        int brightness = bd->props.brightness;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        return lm3533_ctrlbank_set_brightness(&bl->cb, (u8)brightness);
+}
+
+static int lm3533_bl_get_brightness(struct backlight_device *bd)
+{
+        struct lm3533_bl *bl = bl_get_data(bd);
+        u8 val;
+        int ret;
+
+        ret = lm3533_ctrlbank_get_brightness(&bl->cb, &val);
+        if (ret)
+                return ret;
+
+        return val;
+}
+
+static const struct backlight_ops lm3533_bl_ops = {
+        .get_brightness = lm3533_bl_get_brightness,
+        .update_status  = lm3533_bl_update_status,
+};
+
+static ssize_t show_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+
+        return scnprintf(buf, PAGE_SIZE, "%d\n", bl->id);
+}
+
+static ssize_t show_als_channel(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        unsigned channel = lm3533_bl_get_ctrlbank_id(bl);
+
+        return scnprintf(buf, PAGE_SIZE, "%u\n", channel);
+}
+
+static ssize_t show_als_en(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        int ctrlbank = lm3533_bl_get_ctrlbank_id(bl);
+        u8 val;
+        u8 mask;
+        bool enable;
+        int ret;
+
+        ret = lm3533_read(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, &val);
+        if (ret)
+                return ret;
+
+        mask = 1 << (2 * ctrlbank);
+        enable = val & mask;
+
+        return scnprintf(buf, PAGE_SIZE, "%d\n", enable);
+}
+
+static ssize_t store_als_en(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        int ctrlbank = lm3533_bl_get_ctrlbank_id(bl);
+        int enable;
+        u8 val;
+        u8 mask;
+        int ret;
+
+        if (kstrtoint(buf, 0, &enable))
+                return -EINVAL;
+
+        mask = 1 << (2 * ctrlbank);
+
+        if (enable)
+                val = mask;
+        else
+                val = 0;
+
+        ret = lm3533_update(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, val,
+                                                                        mask);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static ssize_t show_linear(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        u8 mask;
+        int linear;
+        int ret;
+
+        ret = lm3533_read(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, &val);
+        if (ret)
+                return ret;
+
+        mask = 1 << (2 * lm3533_bl_get_ctrlbank_id(bl) + 1);
+
+        if (val & mask)
+                linear = 1;
+        else
+                linear = 0;
+
+        return scnprintf(buf, PAGE_SIZE, "%x\n", linear);
+}
+
+static ssize_t store_linear(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        unsigned long linear;
+        u8 mask;
+        u8 val;
+        int ret;
+
+        if (kstrtoul(buf, 0, &linear))
+                return -EINVAL;
+
+        mask = 1 << (2 * lm3533_bl_get_ctrlbank_id(bl) + 1);
+
+        if (linear)
+                val = mask;
+        else
+                val = 0;
+
+        ret = lm3533_update(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, val,
+                                                                        mask);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static ssize_t show_pwm(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        int ret;
+
+        ret = lm3533_ctrlbank_get_pwm(&bl->cb, &val);
+        if (ret)
+                return ret;
+
+        return scnprintf(buf, PAGE_SIZE, "%u\n", val);
+}
+
+static ssize_t store_pwm(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        int ret;
+
+        if (kstrtou8(buf, 0, &val))
+                return -EINVAL;
+
+        ret = lm3533_ctrlbank_set_pwm(&bl->cb, val);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static LM3533_ATTR_RO(als_channel);
+static LM3533_ATTR_RW(als_en);
+static LM3533_ATTR_RO(id);
+static LM3533_ATTR_RW(linear);
+static LM3533_ATTR_RW(pwm);
+
+static struct attribute *lm3533_bl_attributes[] = {
+        &dev_attr_als_channel.attr,
+        &dev_attr_als_en.attr,
+        &dev_attr_id.attr,
+        &dev_attr_linear.attr,
+        &dev_attr_pwm.attr,
+        NULL,
+};
+
+static umode_t lm3533_bl_attr_is_visible(struct kobject *kobj,
+                                             struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        umode_t mode = attr->mode;
+
+        if (attr == &dev_attr_als_channel.attr ||
+                                        attr == &dev_attr_als_en.attr) {
+                if (!bl->lm3533->have_als)
+                        mode = 0;
+        }
+
+        return mode;
+};
+
+static struct attribute_group lm3533_bl_attribute_group = {
+        .is_visible     = lm3533_bl_attr_is_visible,
+        .attrs          = lm3533_bl_attributes
+};
+
+static int __devinit lm3533_bl_setup(struct lm3533_bl *bl,
+                                        struct lm3533_bl_platform_data *pdata)
+{
+        int ret;
+
+        ret = lm3533_ctrlbank_set_max_current(&bl->cb, pdata->max_current);
+        if (ret)
+                return ret;
+
+        return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
+}
+
+static int __devinit lm3533_bl_probe(struct platform_device *pdev)
+{
+        struct lm3533 *lm3533;
+        struct lm3533_bl_platform_data *pdata;
+        struct lm3533_bl *bl;
+        struct backlight_device *bd;
+        struct backlight_properties props;
+        int ret;
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        lm3533 = dev_get_drvdata(pdev->dev.parent);
+        if (!lm3533)
+                return -EINVAL;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+
+        if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
+                dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
+                return -EINVAL;
+        }
+
+        bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+        if (!bl) {
+                dev_err(&pdev->dev,
+                                "failed to allocate memory for backlight\n");
+                return -ENOMEM;
+        }
+
+        bl->lm3533 = lm3533;
+        bl->id = pdev->id;
+
+        bl->cb.lm3533 = lm3533;
+        bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
+        bl->cb.dev = NULL;                      /* until registered */
+
+        memset(&props, 0, sizeof(props));
+        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);
+        if (IS_ERR(bd)) {
+                dev_err(&pdev->dev, "failed to register backlight device\n");
+                ret = PTR_ERR(bd);
+                goto err_free;
+        }
+
+        bl->bd = bd;
+        bl->cb.dev = &bl->bd->dev;
+
+        platform_set_drvdata(pdev, bl);
+
+        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;
+        }
+
+        backlight_update_status(bd);
+
+        ret = lm3533_bl_setup(bl, pdata);
+        if (ret)
+                goto err_sysfs_remove;
+
+        ret = lm3533_ctrlbank_enable(&bl->cb);
+        if (ret)
+                goto err_sysfs_remove;
+
+        return 0;
+
+err_sysfs_remove:
+        sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
+err_unregister:
+        backlight_device_unregister(bd);
+err_free:
+        kfree(bl);
+
+        return ret;
+}
+
+static int __devexit lm3533_bl_remove(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+        struct backlight_device *bd = bl->bd;
+
+        dev_dbg(&bd->dev, "%s\n", __func__);
+
+        bd->props.power = FB_BLANK_POWERDOWN;
+        bd->props.brightness = 0;
+
+        lm3533_ctrlbank_disable(&bl->cb);
+        sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
+        backlight_device_unregister(bd);
+        kfree(bl);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int lm3533_bl_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        return lm3533_ctrlbank_disable(&bl->cb);
+}
+
+static int lm3533_bl_resume(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        return lm3533_ctrlbank_enable(&bl->cb);
+}
+#else
+#define lm3533_bl_suspend       NULL
+#define lm3533_bl_resume        NULL
+#endif
+
+static void lm3533_bl_shutdown(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        lm3533_ctrlbank_disable(&bl->cb);
+}
+
+static struct platform_driver lm3533_bl_driver = {
+        .driver = {
+                .name   = "lm3533-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = lm3533_bl_probe,
+        .remove         = __devexit_p(lm3533_bl_remove),
+        .shutdown       = lm3533_bl_shutdown,
+        .suspend        = lm3533_bl_suspend,
+        .resume         = lm3533_bl_resume,
+};
+module_platform_driver(lm3533_bl_driver);
+
+MODULE_AUTHOR("Johan Hovold <jhovold@gmail.com>");
+MODULE_DESCRIPTION("LM3533 Backlight driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lm3533-backlight");
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 4161f9e3982a..a9f2c36966f1 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
                         goto err;
         }
 
-        st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
+        st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
+                                GFP_KERNEL);
         if (st == NULL) {
                 dev_err(&spi->dev, "No memory for device state\n");
                 ret = -ENOMEM;
@@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
         ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
         if (IS_ERR(ld)) {
                 ret = PTR_ERR(ld);
-                goto err2;
+                goto err;
         }
 
         st->spi = spi;
@@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
 
         return 0;
 
-err2:
-        kfree(st);
 err:
         if (pdata != NULL)
                 gpio_free(pdata->reset_gpio);
@@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi)
         if (pdata != NULL)
                 gpio_free(pdata->reset_gpio);
 
-        kfree(st);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index 333949ff3265..6c0f1ac0d32a 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -232,23 +232,20 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
         struct lcd_device *ld;
         int ret;
 
-        lcd = kzalloc(sizeof(struct ltv350qv), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ltv350qv), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
         lcd->spi = spi;
         lcd->power = FB_BLANK_POWERDOWN;
-        lcd->buffer = kzalloc(8, GFP_KERNEL);
-        if (!lcd->buffer) {
-                ret = -ENOMEM;
-                goto out_free_lcd;
-        }
+        lcd->buffer = devm_kzalloc(&spi->dev, 8, GFP_KERNEL);
+        if (!lcd->buffer)
+                return -ENOMEM;
 
         ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_buffer;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
+
         lcd->ld = ld;
 
         ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
@@ -261,10 +258,6 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
 
 out_unregister:
         lcd_device_unregister(ld);
-out_free_buffer:
-        kfree(lcd->buffer);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -274,8 +267,6 @@ static int __devexit ltv350qv_remove(struct spi_device *spi)
 
         ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd->buffer);
-        kfree(lcd);
 
         return 0;
 }
@@ -310,7 +301,6 @@ static void ltv350qv_shutdown(struct spi_device *spi)
 static struct spi_driver ltv350qv_driver = {
         .driver = {
                 .name           = "ltv350qv",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 0175bfb08a1c..bfdc5fbeaa11 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -168,7 +170,7 @@ static int omapbl_probe(struct platform_device *pdev)
         dev->props.brightness = pdata->default_intensity;
         omapbl_update_status(dev);
 
-        printk(KERN_INFO "OMAP LCD backlight initialised\n");
+        pr_info("OMAP LCD backlight initialised\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index c65853cb9740..c092159f4383 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -111,6 +111,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
         if (!pcf_bl)
                 return -ENOMEM;
 
+        memset(&bl_props, 0, sizeof(bl_props));
         bl_props.type = BACKLIGHT_RAW;
         bl_props.max_brightness = 0x3f;
         bl_props.power = FB_BLANK_UNBLANK;
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 6af183d6465e..69b35f02929e 100644
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -68,13 +70,13 @@ static int progearbl_probe(struct platform_device *pdev)
 
         pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
         if (!pmu_dev) {
-                printk("ALI M7101 PMU not found.\n");
+                pr_err("ALI M7101 PMU not found.\n");
                 return -ENODEV;
         }
 
         sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
         if (!sb_dev) {
-                printk("ALI 1533 SB not found.\n");
+                pr_err("ALI 1533 SB not found.\n");
                 ret = -ENODEV;
                 goto put_pmu;
         }
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index e264f55b2574..6437ae474cf2 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -741,7 +741,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct s6e63m0), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct s6e63m0), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -751,7 +751,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -760,14 +760,12 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         lcd->lcd_pd = (struct lcd_platform_data *)spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_lcd;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
 
         lcd->ld = ld;
 
@@ -824,8 +822,6 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
 
 out_lcd_unregister:
         lcd_device_unregister(ld);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -838,7 +834,6 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
         device_remove_file(&spi->dev, &dev_attr_gamma_mode);
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd);
 
         return 0;
 }
@@ -899,7 +894,6 @@ static void s6e63m0_shutdown(struct spi_device *spi)
 static struct spi_driver s6e63m0_driver = {
         .driver = {
                 .name   = "s6e63m0",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = s6e63m0_probe,
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 2368b8e5f89e..02444d042cd5 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -349,7 +349,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
         if (err)
                 return err;
 
-        lcd = kzalloc(sizeof(struct tdo24m), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct tdo24m), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -357,11 +357,9 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
         lcd->power = FB_BLANK_POWERDOWN;
         lcd->mode = MODE_VGA;   /* default to VGA */
 
-        lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, GFP_KERNEL);
-        if (lcd->buf == NULL) {
-                kfree(lcd);
+        lcd->buf = devm_kzalloc(&spi->dev, TDO24M_SPI_BUFF_SIZE, GFP_KERNEL);
+        if (lcd->buf == NULL)
                 return -ENOMEM;
-        }
 
         m = &lcd->msg;
         x = &lcd->xfer;
@@ -383,15 +381,13 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
                 break;
         default:
                 dev_err(&spi->dev, "Unsupported model");
-                goto out_free;
+                return -EINVAL;
         }
 
         lcd->lcd_dev = lcd_device_register("tdo24m", &spi->dev,
                                         lcd, &tdo24m_ops);
-        if (IS_ERR(lcd->lcd_dev)) {
-                err = PTR_ERR(lcd->lcd_dev);
-                goto out_free;
-        }
+        if (IS_ERR(lcd->lcd_dev))
+                return PTR_ERR(lcd->lcd_dev);
 
         dev_set_drvdata(&spi->dev, lcd);
         err = tdo24m_power(lcd, FB_BLANK_UNBLANK);
@@ -402,9 +398,6 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
 
 out_unregister:
         lcd_device_unregister(lcd->lcd_dev);
-out_free:
-        kfree(lcd->buf);
-        kfree(lcd);
         return err;
 }
 
@@ -414,8 +407,6 @@ static int __devexit tdo24m_remove(struct spi_device *spi)
 
         tdo24m_power(lcd, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->lcd_dev);
-        kfree(lcd->buf);
-        kfree(lcd);
 
         return 0;
 }
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 2b241abced43..0d54e607e82d 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -82,8 +82,11 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct backlight_properties props;
-        struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
+        struct tosa_bl_data *data;
         int ret = 0;
+
+        data = devm_kzalloc(&client->dev, sizeof(struct tosa_bl_data),
+                                GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -92,7 +95,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
         ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
         if (ret) {
                 dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
-                goto err_gpio_bl;
+                return ret;
         }
         ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
         if (ret)
@@ -122,8 +125,6 @@ err_reg:
         data->bl = NULL;
 err_gpio_dir:
         gpio_free(TOSA_GPIO_BL_C20MA);
-err_gpio_bl:
-        kfree(data);
         return ret;
 }
 
@@ -136,8 +137,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
 
         gpio_free(TOSA_GPIO_BL_C20MA);
 
-        kfree(data);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 2231aec23918..47823b8efff0 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -174,7 +174,8 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
         int ret;
         struct tosa_lcd_data *data;
 
-        data = kzalloc(sizeof(struct tosa_lcd_data), GFP_KERNEL);
+        data = devm_kzalloc(&spi->dev, sizeof(struct tosa_lcd_data),
+                                GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -187,7 +188,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
 
         ret = spi_setup(spi);
         if (ret < 0)
-                goto err_spi;
+                return ret;
 
         data->spi = spi;
         dev_set_drvdata(&spi->dev, data);
@@ -224,8 +225,6 @@ err_gpio_dir:
         gpio_free(TOSA_GPIO_TG_ON);
 err_gpio_tg:
         dev_set_drvdata(&spi->dev, NULL);
-err_spi:
-        kfree(data);
         return ret;
 }
 
@@ -242,7 +241,6 @@ static int __devexit tosa_lcd_remove(struct spi_device *spi)
 
         gpio_free(TOSA_GPIO_TG_ON);
         dev_set_drvdata(&spi->dev, NULL);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 5d365deb5f82..9e5517a3a52b 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -194,6 +194,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         data->current_brightness = 0;
         data->isink_reg = isink_reg;
 
+        memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_isel;
         bl = backlight_device_register("wm831x", &pdev->dev, data,