From patchwork Wed Jan 21 01:50:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 431301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F0AF1140273 for ; Wed, 21 Jan 2015 12:50:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbbAUBuU (ORCPT ); Tue, 20 Jan 2015 20:50:20 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:62891 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293AbbAUBuL (ORCPT ); Tue, 20 Jan 2015 20:50:11 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so49500979pab.4 for ; Tue, 20 Jan 2015 17:50:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=kYREaR2I0KJie1+XnD6A3PHzkI4RZIy5yPOeVPG9OMQ=; b=ZDYv6OE4KSN8k+fIoLrNY3JJa35D0CXZuLcwifTlH9FN9QBLqqcUvauZgwY4oKjEWo Q/wNfnZcChdoVRaFFm8eUU1508y1CrzWSmpXWK6FJjpeKHES3Poluj3weyJhL9hSeYiD jEzQmuhMhlyOXZwEmsxfk0j7nJ1HAwuaWlfZzxPeeI5wh427eLwRbotK/EArpJRrLgew ZZZH5J3hbXE+jlFjJAzFcU8z8YxFuwhbbqPQiZgwhjaWxdAAcKEhtEj448hX+e5zupIW L40QNRd07fSRttJDJPh2rvFb9xtDK7Eq2Z7Eq3J0cExyixiG1xzKkCdc7913T20r6z3M BeIg== X-Gm-Message-State: ALoCoQmkrMs262RtU6avnj9tc68r4arLEwz0d3yW/z5dAbW3HpO9cmPhvJHJZS+5IzixDe2Z/7jD X-Received: by 10.70.22.164 with SMTP id e4mr31065165pdf.24.1421805010511; Tue, 20 Jan 2015 17:50:10 -0800 (PST) Received: from [192.168.0.104] (218-164-101-78.dynamic.hinet.net. [218.164.101.78]) by mx.google.com with ESMTPSA id ob4sm1254052pdb.48.2015.01.20.17.50.08 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2015 17:50:09 -0800 (PST) Message-ID: <1421805006.9831.1.camel@phoenix> Subject: [PATCH] gpio: ge: Convert to use devm_kstrdup From: Axel Lin To: Linus Walleij , Alexandre Courbot Cc: Kamlakant Patel , Martyn Welch , "linux-gpio@vger.kernel.org" Date: Wed, 21 Jan 2015 09:50:06 +0800 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Use devm_kstrdup to simplify the error handling path. Also return -ENOMEM instead of 0 if devm_kstrdup fails. Signed-off-by: Axel Lin --- drivers/gpio/gpio-ge.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c index 6ea9303..f9ac3f3 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",