summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-ge.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-01-21 09:50:06 +0800
committerLinus Walleij <linus.walleij@linaro.org>2015-01-29 10:33:15 +0100
commit74b18de94cfb7b7a12b581015e8e317d4fa5d752 (patch)
tree1c304e5e3c5412d2794052fa3e9a67ee7a338574 /drivers/gpio/gpio-ge.c
parentef3b2bd6f3c797d6672cf2739565752019458824 (diff)
gpio: ge: Convert to use devm_kstrdup
Use devm_kstrdup to simplify the error handling path. Also return -ENOMEM instead of 0 if devm_kstrdup fails. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-ge.c')
-rw-r--r--drivers/gpio/gpio-ge.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index 6ea930372028..f9ac3f351753 100644
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -76,9 +76,12 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
}
/* Setup pointers to chip functions */
- bgc->gc.label = kstrdup(pdev->dev.of_node->full_name, GFP_KERNEL);
- if (!bgc->gc.label)
+ bgc->gc.label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name,
+ GFP_KERNEL);
+ if (!bgc->gc.label) {
+ ret = -ENOMEM;
goto err0;
+ }
bgc->gc.base = -1;
bgc->gc.ngpio = (u16)(uintptr_t)of_id->data;
@@ -88,11 +91,9 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
/* This function adds a memory mapped GPIO chip */
ret = gpiochip_add(&bgc->gc);
if (ret)
- goto err1;
+ goto err0;
return 0;
-err1:
- kfree(bgc->gc.label);
err0:
iounmap(regs);
pr_err("%s: GPIO chip registration failed\n",