From patchwork Thu Aug 22 12:46:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 2848246 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 518EFBF546 for ; Thu, 22 Aug 2013 12:53:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D280205B9 for ; Thu, 22 Aug 2013 12:53:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51AF6205B7 for ; Thu, 22 Aug 2013 12:53:21 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCUNZ-0003rC-U4; Thu, 22 Aug 2013 12:52:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCUND-0007OR-Vf; Thu, 22 Aug 2013 12:52:24 +0000 Received: from na3sys009aog107.obsmtp.com ([74.125.149.197]) by merlin.infradead.org with smtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCUMy-0007KK-Km for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2013 12:52:09 +0000 Received: from sc-owa02.marvell.com ([199.233.58.137]) (using TLSv1) by na3sys009aob107.postini.com ([74.125.148.12]) with SMTP ID DSNKUhYJWkm0idpUTKHEYXj2RljGsvUd+4Mk@postini.com; Thu, 22 Aug 2013 05:52:08 PDT Received: from maili.marvell.com (10.93.76.43) by sc-owa02.marvell.com (10.93.76.22) with Microsoft SMTP Server id 8.3.213.0; Thu, 22 Aug 2013 05:48:34 -0700 Received: from xhacker.marvell.com (unknown [10.37.135.179]) by maili.marvell.com (Postfix) with ESMTP id DDF801CCD9C; Thu, 22 Aug 2013 05:48:31 -0700 (PDT) From: Jisheng Zhang To: , , , , , , , , Subject: [PATCH 4/4] pinctrl: mvebu: add missing iounmap Date: Thu, 22 Aug 2013 20:46:51 +0800 Message-ID: <1377175611-4241-5-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1377175611-4241-1-git-send-email-jszhang@marvell.com> References: <1377175611-4241-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130822_085208_894140_A83E3A08 X-CRM114-Status: UNSURE ( 8.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) Cc: linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing iounmap to prove error path and remove path Signed-off-by: Jisheng Zhang --- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c index bb7ddb1..d1ac6b7 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c @@ -601,7 +601,8 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) GFP_KERNEL); if (!pctl) { dev_err(&pdev->dev, "unable to alloc driver\n"); - return -ENOMEM; + ret = -ENOMEM; + goto bail_out; } pctl->desc.name = dev_name(&pdev->dev); @@ -631,7 +632,8 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) if (ctrl->mpp_get || ctrl->mpp_set) { if (!ctrl->name || !ctrl->mpp_get || !ctrl->mpp_set) { dev_err(&pdev->dev, "wrong soc control info\n"); - return -EINVAL; + ret = -EINVAL; + goto bail_out; } pctl->num_groups += 1; continue; @@ -641,7 +643,8 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) names = devm_kzalloc(&pdev->dev, ctrl->npins * 8, GFP_KERNEL); if (!names) { dev_err(&pdev->dev, "failed to alloc mpp names\n"); - return -ENOMEM; + ret = -ENOMEM; + goto bail_out; } for (k = 0; k < ctrl->npins; k++) sprintf(names + 8*k, "mpp%d", ctrl->pid+k); @@ -653,7 +656,8 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) sizeof(struct pinctrl_pin_desc), GFP_KERNEL); if (!pdesc) { dev_err(&pdev->dev, "failed to alloc pinctrl pins\n"); - return -ENOMEM; + ret = -ENOMEM; + goto bail_out; } for (n = 0; n < pctl->desc.npins; n++) @@ -664,7 +668,8 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) sizeof(struct mvebu_pinctrl_group), GFP_KERNEL); if (!pctl->groups) { dev_err(&pdev->dev, "failed to alloc pinctrl groups\n"); - return -ENOMEM; + ret = -ENOMEM; + goto bail_out; } /* assign mpp controls to groups */ @@ -735,13 +740,14 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) ret = mvebu_pinctrl_build_functions(pdev, pctl); if (ret) { dev_err(&pdev->dev, "unable to build functions\n"); - return ret; + goto bail_out; } pctl->pctldev = pinctrl_register(&pctl->desc, &pdev->dev, pctl); if (!pctl->pctldev) { dev_err(&pdev->dev, "unable to register pinctrl driver\n"); - return -EINVAL; + ret = -EINVAL; + goto bail_out; } dev_info(&pdev->dev, "registered pinctrl driver\n"); @@ -751,11 +757,15 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) pinctrl_add_gpio_range(pctl->pctldev, &soc->gpioranges[n]); return 0; +bail_out: + iounmap(base); + return ret; } int mvebu_pinctrl_remove(struct platform_device *pdev) { struct mvebu_pinctrl *pctl = platform_get_drvdata(pdev); + iounmap(pctl->base); pinctrl_unregister(pctl->pctldev); return 0; }