leds: Convert S3C24XX LED driver to devm_kzalloc()
authorSylwester Nawrocki <sylvester.nawrocki@gmail.com>
Sat, 30 Jun 2012 12:30:25 +0000 (20:30 +0800)
committerBryan Wu <bryan.wu@canonical.com>
Mon, 23 Jul 2012 23:52:36 +0000 (07:52 +0800)
Use the device managed resource API for simplifying
the error/driver remove paths.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
drivers/leds/leds-s3c24xx.c

index e6ee1054826576428f3bf3928ba043a1490bce7e..b816ccb9adf495986d76f2b0e460713bd8d4161f 100644 (file)
@@ -63,7 +63,6 @@ static int s3c24xx_led_remove(struct platform_device *dev)
        struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
 
        led_classdev_unregister(&led->cdev);
-       kfree(led);
 
        return 0;
 }
@@ -74,7 +73,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
        struct s3c24xx_gpio_led *led;
        int ret;
 
-       led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL);
+       led = devm_kzalloc(&dev->dev, sizeof(struct s3c24xx_gpio_led),
+                          GFP_KERNEL);
        if (led == NULL) {
                dev_err(&dev->dev, "No memory for device\n");
                return -ENOMEM;
@@ -103,10 +103,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
        /* register our new led device */
 
        ret = led_classdev_register(&dev->dev, &led->cdev);
-       if (ret < 0) {
+       if (ret < 0)
                dev_err(&dev->dev, "led_classdev_register failed\n");
-               kfree(led);
-       }
 
        return ret;
 }