Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu.

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (24 commits)
  leds: add output driver configuration for pca9633 led driver
  leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()
  leds: Add new LED driver for lm3642 chips
  leds-lp5523: Fix riskiness of the page fault
  leds-lp5523: turn off the LED engines on unloading the driver
  leds-lm3530: Fix smatch warnings
  leds-lm3530: Use devm_regulator_get function
  leds: leds-gpio: adopt pinctrl support
  leds: Add new LED driver for lm355x chips
  leds-lp5523: use the i2c device id rather than fixed name
  leds-lp5523: add new device id for LP55231
  leds-lp5523: support new LP55231 device
  leds: triggers: send uevent when changing triggers
  leds-lp5523: minor code style fixes
  leds-lp5523: change the return type of lp5523_set_mode()
  leds-lp5523: set the brightness to 0 forcely on removing the driver
  leds-lp5523: add channel name in the platform data
  leds: leds-gpio: Use of_get_child_count() helper
  leds: leds-gpio: Use platform_{get,set}_drvdata
  leds: leds-gpio: use of_match_ptr()
  ...

1 files changed, 7 insertions, 22 deletions

diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index 4c62113f7a77..88f23f845595 100644
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -201,7 +201,7 @@ static int wm8350_led_probe(struct platform_device *pdev)
         struct regulator *isink, *dcdc;
         struct wm8350_led *led;
         struct wm8350_led_platform_data *pdata = pdev->dev.platform_data;
-        int ret, i;
+        int i;
 
         if (pdata == NULL) {
                 dev_err(&pdev->dev, "no platform data\n");
@@ -214,24 +214,21 @@ static int wm8350_led_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        isink = regulator_get(&pdev->dev, "led_isink");
+        isink = devm_regulator_get(&pdev->dev, "led_isink");
         if (IS_ERR(isink)) {
                 printk(KERN_ERR "%s: can't get ISINK\n", __func__);
                 return PTR_ERR(isink);
         }
 
-        dcdc = regulator_get(&pdev->dev, "led_vcc");
+        dcdc = devm_regulator_get(&pdev->dev, "led_vcc");
         if (IS_ERR(dcdc)) {
                 printk(KERN_ERR "%s: can't get DCDC\n", __func__);
-                ret = PTR_ERR(dcdc);
-                goto err_isink;
+                return PTR_ERR(dcdc);
         }
 
         led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL);
-        if (led == NULL) {
-                ret = -ENOMEM;
-                goto err_dcdc;
-        }
+        if (led == NULL)
+                return -ENOMEM;
 
         led->cdev.brightness_set = wm8350_led_set;
         led->cdev.default_trigger = pdata->default_trigger;
@@ -257,17 +254,7 @@ static int wm8350_led_probe(struct platform_device *pdev)
         led->value = LED_OFF;
         platform_set_drvdata(pdev, led);
 
-        ret = led_classdev_register(&pdev->dev, &led->cdev);
-        if (ret < 0)
-                goto err_dcdc;
-
-        return 0;
-
- err_dcdc:
-        regulator_put(dcdc);
- err_isink:
-        regulator_put(isink);
-        return ret;
+        return led_classdev_register(&pdev->dev, &led->cdev);
 }
 
 static int wm8350_led_remove(struct platform_device *pdev)
@@ -277,8 +264,6 @@ static int wm8350_led_remove(struct platform_device *pdev)
         led_classdev_unregister(&led->cdev);
         flush_work(&led->work);
         wm8350_led_disable(led);
-        regulator_put(led->dcdc);
-        regulator_put(led->isink);
         return 0;
 }