leds: gpio: switch to managed version of led_classdev_register

Using the managed version of led_classdev_register allows to
significantly simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 00a24e32c6c6a9dc46baec15e0b969e95e16ef9d..ab273f85ac3c3a6a293782e2d50e8e89972755d8 100644 (file)
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -139,7 +139,7 @@ static int create_gpio_led(const struct gpio_led *template,
        if (ret < 0)
                return ret;
 
-       return led_classdev_register(parent, &led_dat->cdev);
+       return devm_led_classdev_register(parent, &led_dat->cdev);
 }
 
 struct gpio_leds_priv {
@@ -219,8 +219,6 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
        return priv;
 
 err:
-       for (count = priv->num_leds - 1; count >= 0; count--)
-               led_classdev_unregister(&priv->leds[count].cdev);
        return ERR_PTR(ret);
 }
 
@@ -249,13 +247,8 @@ static int gpio_led_probe(struct platform_device *pdev)
                        ret = create_gpio_led(&pdata->leds[i],
                                              &priv->leds[i],
                                              &pdev->dev, pdata->gpio_blink_set);
-                       if (ret < 0) {
-                               /* On failure: unwind the led creations */
-                               for (i = i - 1; i >= 0; i--)
-                                       led_classdev_unregister(
-                                                       &priv->leds[i].cdev);
+                       if (ret < 0)
                                return ret;
-                       }
                }
        } else {
                priv = gpio_leds_create(pdev);
@@ -268,17 +261,6 @@ static int gpio_led_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int gpio_led_remove(struct platform_device *pdev)
-{
-       struct gpio_leds_priv *priv = platform_get_drvdata(pdev);
-       int i;
-
-       for (i = 0; i < priv->num_leds; i++)
-               led_classdev_unregister(&priv->leds[i].cdev);
-
-       return 0;
-}
-
 static void gpio_led_shutdown(struct platform_device *pdev)
 {
        struct gpio_leds_priv *priv = platform_get_drvdata(pdev);
@@ -293,7 +275,6 @@ static void gpio_led_shutdown(struct platform_device *pdev)
 
 static struct platform_driver gpio_led_driver = {
        .probe          = gpio_led_probe,
-       .remove         = gpio_led_remove,
        .shutdown       = gpio_led_shutdown,
        .driver         = {
                .name   = "leds-gpio",