30 files changed, 164 insertions, 158 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 48cce18e9d6d..a20752f562bc 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -211,7 +211,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
         led_trigger_set_default(led_cdev);
 #endif
 
-        printk(KERN_DEBUG "Registered led device: %s\n",
+        dev_dbg(parent, "Registered led device: %s\n",
                         led_cdev->name);
 
         return 0;
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 262eb4193710..3c972b2f9893 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -166,6 +166,19 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
 }
 EXPORT_SYMBOL_GPL(led_trigger_set_default);
 
+void led_trigger_rename_static(const char *name, struct led_trigger *trig)
+{
+        /* new name must be on a temporary string to prevent races */
+        BUG_ON(name == trig->name);
+
+        down_write(&triggers_list_lock);
+        /* this assumes that trig->name was originaly allocated to
+         * non constant storage */
+        strcpy((char *)trig->name, name);
+        up_write(&triggers_list_lock);
+}
+EXPORT_SYMBOL_GPL(led_trigger_rename_static);
+
 /* LED Trigger Interface */
 
 int led_trigger_register(struct led_trigger *trig)
@@ -300,13 +313,13 @@ void led_trigger_register_simple(const char *name, struct led_trigger **tp)
                 if (err < 0) {
                         kfree(trig);
                         trig = NULL;
-                        printk(KERN_WARNING "LED trigger %s failed to register"
-                                " (%d)\n", name, err);
+                        pr_warn("LED trigger %s failed to register (%d)\n",
+                                name, err);
                 }
-        } else
-                printk(KERN_WARNING "LED trigger %s failed to register"
-                        " (no memory)\n", name);
-
+        } else {
+                pr_warn("LED trigger %s failed to register (no memory)\n",
+                        name);
+        }
         *tp = trig;
 }
 EXPORT_SYMBOL_GPL(led_trigger_register_simple);
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index b7e8cc0957fc..6be2edd41173 100644
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -165,15 +165,13 @@ static int pm860x_led_probe(struct platform_device *pdev)
         res = platform_get_resource_byname(pdev, IORESOURCE_REG, "control");
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for control\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_control = res->start;
         res = platform_get_resource_byname(pdev, IORESOURCE_REG, "blink");
         if (!res) {
                 dev_err(&pdev->dev, "No REG resource for blink\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
         data->reg_blink = res->start;
         memset(data->name, 0, MFD_NAME_SIZE);
@@ -224,9 +222,6 @@ static int pm860x_led_probe(struct platform_device *pdev)
         }
         pm860x_led_set(&data->cdev, 0);
         return 0;
-out:
-        devm_kfree(&pdev->dev, data);
-        return ret;
 }
 
 static int pm860x_led_remove(struct platform_device *pdev)
diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index dcd9128a51a9..e8072abe76e5 100644
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -5,10 +5,10 @@
  *
  * Loosely derived from leds-da903x:
  * Copyright (C) 2008 Compulab, Ltd.
- *      Mike Rapoport <mike@compulab.co.il>
+ *      Mike Rapoport <mike@compulab.co.il>
  *
  * Copyright (C) 2006-2008 Marvell International Ltd.
- *      Eric Miao <eric.miao@marvell.com>
+ *      Eric Miao <eric.miao@marvell.com>
  *
  * Licensed under the GPL-2 or later.
  */
diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c
index 9abe8de40edd..851517030cc1 100644
--- a/drivers/leds/leds-bd2802.c
+++ b/drivers/leds/leds-bd2802.c
@@ -26,8 +26,8 @@
 #define BD2802_LED_OFFSET               0xa
 #define BD2802_COLOR_OFFSET             0x3
 
-#define BD2802_REG_CLKSETUP             0x00
-#define BD2802_REG_CONTROL              0x01
+#define BD2802_REG_CLKSETUP             0x00
+#define BD2802_REG_CONTROL              0x01
 #define BD2802_REG_HOURSETUP            0x02
 #define BD2802_REG_CURRENT1SETUP        0x03
 #define BD2802_REG_CURRENT2SETUP        0x04
@@ -93,7 +93,7 @@ struct bd2802_led {
          * In ADF mode, user can set registers of BD2802GU directly,
          * therefore BD2802GU doesn't enter reset state.
          */
-        int                             adf_on;
+        int                             adf_on;
 
         enum led_ids                    led_id;
         enum led_colors                 color;
@@ -328,7 +328,7 @@ static ssize_t bd2802_store_reg##reg_addr(struct device *dev,		\
         int ret;                                                        \
         if (!count)                                                     \
                 return -EINVAL;                                         \
-        ret = strict_strtoul(buf, 16, &val);                            \
+        ret = kstrtoul(buf, 16, &val);                                  \
         if (ret)                                                        \
                 return ret;                                             \