]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
leds: leds-ot200: Use devm_led_classdev_register
authorMuhammad Falak R Wani <falakreyaz@gmail.com>
Sat, 5 Sep 2015 14:23:27 +0000 (19:53 +0530)
committerJacek Anaszewski <j.anaszewski@samsung.com>
Tue, 3 Nov 2015 07:59:13 +0000 (08:59 +0100)
Use resource-managed function devm_led_classdev_register
instead of led_classdev_register to make the error path simpler.
The goto is replaced with direct return, unneeded label err is
dropped. Also, remove redundant ot200_led_remove.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
drivers/leds/leds-ot200.c

index 39870de20a26fff25d6eba7c767d68fb8c12aa8e..12af1127d9b78117086cb2c83cc0fb2c776625b7 100644 (file)
@@ -124,9 +124,9 @@ static int ot200_led_probe(struct platform_device *pdev)
                leds[i].cdev.name = leds[i].name;
                leds[i].cdev.brightness_set = ot200_led_brightness_set;
 
-               ret = led_classdev_register(&pdev->dev, &leds[i].cdev);
+               ret = devm_led_classdev_register(&pdev->dev, &leds[i].cdev);
                if (ret < 0)
-                       goto err;
+                       return ret;
        }
 
        leds_front = 0;         /* turn off all front leds */
@@ -135,27 +135,10 @@ static int ot200_led_probe(struct platform_device *pdev)
        outb(leds_back, 0x5a);
 
        return 0;
-
-err:
-       for (i = i - 1; i >= 0; i--)
-               led_classdev_unregister(&leds[i].cdev);
-
-       return ret;
-}
-
-static int ot200_led_remove(struct platform_device *pdev)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(leds); i++)
-               led_classdev_unregister(&leds[i].cdev);
-
-       return 0;
 }
 
 static struct platform_driver ot200_led_driver = {
        .probe          = ot200_led_probe,
-       .remove         = ot200_led_remove,
        .driver         = {
                .name   = "leds-ot200",
        },