diff options
| author | Georgiana Rodica Chelu <georgiana.chelu93@gmail.com> | 2014-03-08 18:30:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-08 19:50:31 -0800 |
| commit | 48be81830eb72ce95b33075cce9fdfa39443dce6 (patch) | |
| tree | caa7a555523f359393ab927c9b36aeede484c695 /drivers/staging/android/timed_gpio.c | |
| parent | 9f9d25c940a3c21abd5df80a0e8c8f72fbe6b1d4 (diff) | |
staging: android: Use devm_kzalloc instead of kzalloc
Use devm_kzalloc instead of kzalloc in staging/android/timed_gpio.c
Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/timed_gpio.c')
| -rw-r--r-- | drivers/staging/android/timed_gpio.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index e81451425c01..3f69b3481779 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/drivers/staging/android/timed_gpio.c @@ -90,8 +90,9 @@ static int timed_gpio_probe(struct platform_device *pdev) if (!pdata) return -EBUSY; - gpio_data = kzalloc(sizeof(struct timed_gpio_data) * pdata->num_gpios, - GFP_KERNEL); + gpio_data = devm_kzalloc(&pdev->dev, + sizeof(struct timed_gpio_data) * pdata->num_gpios, + GFP_KERNEL); if (!gpio_data) return -ENOMEM; @@ -131,7 +132,6 @@ err_out: timed_output_dev_unregister(&gpio_data[i].dev); gpio_free(gpio_data[i].gpio); } - kfree(gpio_data); return ret; } @@ -147,8 +147,6 @@ static int timed_gpio_remove(struct platform_device *pdev) gpio_free(gpio_data[i].gpio); } - kfree(gpio_data); - return 0; } |