From 74b18de94cfb7b7a12b581015e8e317d4fa5d752 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 21 Jan 2015 09:50:06 +0800 Subject: 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 Signed-off-by: Linus Walleij --- drivers/gpio/gpio-ge.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/gpio') 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", -- cgit v1.2.1