diff options
| author |   Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-06-30 20:30:25 +0800 |
|---|---|---|
| committer |   Bryan Wu <bryan.wu@canonical.com> | 2012-07-24 07:52:36 +0800 |
| commit | 7e97b58133b7cddf3be80660300bb2c77c514c6f (patch) | |
| tree | c27aa227a5228dac038286ff82c0f767939d0653 /drivers/leds/leds-s3c24xx.c | |
| parent | leds-mc13783: set platform data to NULL at mc13783_led_remove (diff) | |
| download | linux-dev-7e97b58133b7cddf3be80660300bb2c77c514c6f.tar.xz linux-dev-7e97b58133b7cddf3be80660300bb2c77c514c6f.zip | |
leds: Convert S3C24XX LED driver to devm_kzalloc()
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>
Diffstat (limited to 'drivers/leds/leds-s3c24xx.c')
| -rw-r--r-- | drivers/leds/leds-s3c24xx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index e6ee10548265..b816ccb9adf4 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c @@ -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; } |