summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-da9052.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-09-01 17:34:15 +0800
committerLinus Walleij <linus.walleij@linaro.org>2012-09-01 12:53:56 +0200
commiteb7cf95a55a0d737e5f5694e71f65966a1c4e7aa (patch)
treef51b9cd3dbd91bbf1669daab9e75d61710216659 /drivers/gpio/gpio-da9052.c
parent6ab49f4201676a96f62d0f327206a28dc02f2e2f (diff)
downloadop-kernel-dev-eb7cf95a55a0d737e5f5694e71f65966a1c4e7aa.zip
op-kernel-dev-eb7cf95a55a0d737e5f5694e71f65966a1c4e7aa.tar.gz
gpio: da9052: Convert to use devm_kzalloc API
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-da9052.c')
-rw-r--r--drivers/gpio/gpio-da9052.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 56dd047..24b8c29 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -207,7 +207,7 @@ static int __devinit da9052_gpio_probe(struct platform_device *pdev)
struct da9052_pdata *pdata;
int ret;
- gpio = kzalloc(sizeof(*gpio), GFP_KERNEL);
+ gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
if (gpio == NULL)
return -ENOMEM;
@@ -221,28 +221,19 @@ static int __devinit da9052_gpio_probe(struct platform_device *pdev)
ret = gpiochip_add(&gpio->gp);
if (ret < 0) {
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
- goto err_mem;
+ return ret;
}
platform_set_drvdata(pdev, gpio);
return 0;
-
-err_mem:
- kfree(gpio);
- return ret;
}
static int __devexit da9052_gpio_remove(struct platform_device *pdev)
{
struct da9052_gpio *gpio = platform_get_drvdata(pdev);
- int ret;
-
- ret = gpiochip_remove(&gpio->gp);
- if (ret == 0)
- kfree(gpio);
- return ret;
+ return gpiochip_remove(&gpio->gp);
}
static struct platform_driver da9052_gpio_driver = {
OpenPOWER on IntegriCloud