From patchwork Wed Mar 9 23:50:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 8551871 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 558099F38C for ; Thu, 10 Mar 2016 00:17:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69FFD2026F for ; Thu, 10 Mar 2016 00:17:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CAED20165 for ; Thu, 10 Mar 2016 00:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934565AbcCJARD (ORCPT ); Wed, 9 Mar 2016 19:17:03 -0500 Received: from vern.gendns.com ([206.190.152.46]:41283 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934463AbcCJARC (ORCPT ); Wed, 9 Mar 2016 19:17:02 -0500 X-Greylist: delayed 1571 seconds by postgrey-1.27 at vger.kernel.org; Wed, 09 Mar 2016 19:17:01 EST DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From; bh=xZY3j/FPtt+w27EJaK1Amma+3rNKIhv2CRiD+busMEU=; b=LcPAUhlLyS7pF 2mAfxxaO082dZZkBwwk/A6iFGo927dCNf3cPaTi8QTXwOwjP9LF/IRk2e/XHb5KNVU4CHiWCTqdqp gBguGRIN5ZgljnOACtOIK8nEbvK6lFmZeFx3wfDdZrKETr1rTYxySfAXL/BZf7/hbYRmUnVMwCG9u CPXLeC+2KiUZJO+q+v6nPP78QzabzkgZHmowmOOmfA2FBEcUn0bCWrpcd7y5BvKLqTsRd8Pqzeg5Q zPXYEj+KVj7ulpNVwLMXVVpvHT18dTnn4l3+QuKhPvreIjMDgs+/AvW3i/bh05/CjA+humo66YEST 18cnx3oMLaP5FV1g5aJ5Q==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:44905 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.86_1) (envelope-from ) id 1adnsM-0002NE-VH; Wed, 09 Mar 2016 18:50:47 -0500 From: David Lechner To: ulf.hansson@linaro.org, k.kozlowski.k@gmail.com, linux-mmc@vger.kernel.org Cc: nsekhar@ti.com, khilman@deeprootsystems.com, linux-arm-kernel@lists.infradead.org, David Lechner Subject: [PATCH 2/4] mmc: davinci: fix unwinding in probe Date: Wed, 9 Mar 2016 17:50:03 -0600 Message-Id: <1457567405-30475-3-git-send-email-david@lechnology.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457567405-30475-1-git-send-email-david@lechnology.com> References: <1457567405-30475-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Unwiding from an error in davinci_mmcsd_probe was a mess. Some errors were not handled and not all paths unwound correctly. Signed-off-by: David Lechner --- drivers/mmc/host/davinci_mmc.c | 62 +++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 469aa8c..f571549 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -1232,7 +1232,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) struct mmc_davinci_host *host = NULL; struct mmc_host *mmc = NULL; struct resource *r, *mem = NULL; - int ret = 0, irq = 0; + int ret, irq; size_t mem_size; const struct platform_device_id *id_entry; @@ -1242,22 +1242,21 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) return -ENOENT; } - ret = -ENODEV; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); if (!r || irq == NO_IRQ) - goto out; + return -ENODEV; - ret = -EBUSY; mem_size = resource_size(r); mem = request_mem_region(r->start, mem_size, pdev->name); if (!mem) - goto out; + return -EBUSY; - ret = -ENOMEM; mmc = mmc_alloc_host(sizeof(struct mmc_davinci_host), &pdev->dev); - if (!mmc) - goto out; + if (!mmc) { + ret = -ENOMEM; + goto mmc_alloc_host_fail; + } host = mmc_priv(mmc); host->mmc = mmc; /* Important */ @@ -1277,15 +1276,17 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) host->mem_res = mem; host->base = ioremap(mem->start, mem_size); if (!host->base) - goto out; + goto ioremap_fail; - ret = -ENXIO; host->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(host->clk)) { ret = PTR_ERR(host->clk); - goto out; + goto clk_get_fail; } - clk_enable(host->clk); + ret = clk_enable(host->clk); + if (ret) + goto clk_enable_fail; + host->mmc_input_clk = clk_get_rate(host->clk); init_mmcsd_host(host); @@ -1355,11 +1356,11 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) ret = mmc_add_host(mmc); if (ret < 0) - goto out; + goto mmc_add_host_fail; ret = request_irq(irq, mmc_davinci_irq, 0, mmc_hostname(mmc), host); if (ret) - goto out; + goto request_irq_fail; if (host->sdio_irq >= 0) { ret = request_irq(host->sdio_irq, mmc_davinci_sdio_irq, 0, @@ -1376,28 +1377,21 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) return 0; -out: +request_irq_fail: + mmc_remove_host(mmc); +mmc_add_host_fail: mmc_davinci_cpufreq_deregister(host); cpu_freq_fail: - if (host) { - davinci_release_dma_channels(host); - - if (host->clk) { - clk_disable(host->clk); - clk_put(host->clk); - } - - if (host->base) - iounmap(host->base); - } - - if (mmc) - mmc_free_host(mmc); - - if (mem) - release_resource(mem); - - dev_dbg(&pdev->dev, "probe err %d\n", ret); + davinci_release_dma_channels(host); + clk_disable(host->clk); +clk_enable_fail: + clk_put(host->clk); +clk_get_fail: + iounmap(host->base); +ioremap_fail: + mmc_free_host(mmc); +mmc_alloc_host_fail: + release_resource(mem); return ret; }