From patchwork Sat Sep 17 15:19:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9337191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5CE7360839 for ; Sat, 17 Sep 2016 15:21:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D14928CDD for ; Sat, 17 Sep 2016 15:21:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4074C28CDF; Sat, 17 Sep 2016 15:21:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C898F28CDD for ; Sat, 17 Sep 2016 15:21:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1blHPT-0000c9-57; Sat, 17 Sep 2016 15:20:07 +0000 Received: from mout.web.de ([217.72.192.78]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1blHPO-0000Fv-6q for linux-arm-kernel@lists.infradead.org; Sat, 17 Sep 2016 15:20:03 +0000 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0M40zO-1av6Ht2lfe-00rcJN; Sat, 17 Sep 2016 17:19:35 +0200 Subject: [PATCH 11/24] ste_dma40: Rename a jump label in d40_probe() To: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Dan Williams , Linus Walleij , Vinod Koul References: <566ABCD9.1060404@users.sourceforge.net> <92810066-69b6-94e7-dcec-a28594b1328f@users.sourceforge.net> From: SF Markus Elfring Message-ID: <02a8a05c-c0d7-0791-eddb-d6ad18d78e27@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:19:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <92810066-69b6-94e7-dcec-a28594b1328f@users.sourceforge.net> X-Provags-ID: V03:K0:oEAksp+VvE4l6dW21jgIzrX6tIaF81CEJ0kGuMTOlMZtKmfoIm6 GMlvLHh1TjA7zPhxmW5LF7Y+2ABKajAS9ICFNaTlLomH2Yv9Ea3rZ53UQBjzsDg8VAgcy64 7I/m3QGDyNYN0bXTAR0WFCwXH9OQNudRkA3WSkq5FfiBHMAOPVnvLdkWz3pAJsUugULPCQe E+2Hm7uV9A+1wflFmucyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:hgN1XAt9ReY=:fA2pT5IxeT6PGwF3n/xgg+ Wj9n7x59kBWnfY/avGiB81Ocij6m9TdrbH5myHhW2EhjbXiSpsZEVjpd6C7nj5NwUfKsFIXtf b0+stBM2292Ue4HhhcDAufBCiPj5YzNgStKngyrh1zfI3g7fILa+b7CGMqkleQvu2x4Tc6uuD l8jFfDLjqIZcZ2Qw5f2nGyGLjghTmmJnPZZBU75PMBljm40TzLk5mCk36dromjXdM1pRymQtC KhuWyMskFow6/oE+u4VYkm+5s9QTaDRkXdtCWv6k+LyDXZfG+cF/p3OqqtxwvGtJgiqRCzvbW u11fxnVRV0gSqg3JLEjWi30BIIIoZvEMw7AUZuEElP/p0lypg+Ju9PKOZT+zbTeXEtG9CuxzW hlrhJgqoITx6LHswXFiiRktlW5E2fyO68Fzj6BZDh0UKC4wdXugSnbgxNPJqjAfEEwkXTee7A mxEF8lnXmPtuwGELMww7ZcAGRK+dUOyLTI0mT+8MWxi9ZUNM6MAVSP3Vz0tS5DcEaijDvDKDE eGBs6MduraaJ1bHYgsw9UxLu+XHAPm28YEuZJhz7E+Hq+kEX2Bn+cVm5IgglEDZr3jMordHeJ kXLLoRk2fFpwGG6wyw56GsRVtJslXzlBsLI33lfVH1tzryJZ5UOwBatikJcqCBHLA++9gGL3z 2D3OXnerpbvGkDnG8M423+DEb8wVG+FBZAFP0f5BsoUadg3hdnLLDAPX9J30/Aut0VfVoalfj Bn5X3ldepYEjrPRawTFSgSXOZRO7fPtiAse70m/5K9k3ED5pr8kjP3iG0RY8+R8WRfmOVsr2A LJ8Ywgg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160917_082002_696152_1C519663 X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 17 Sep 2016 14:50:53 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 4ebc825..ed96039 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3570,7 +3570,7 @@ static int __init d40_probe(struct platform_device *pdev) if (!res) { ret = -ENOENT; d40_err(&pdev->dev, "No \"lcpa\" memory resource\n"); - goto failure; + goto destroy_cache; } base->lcpa_size = resource_size(res); base->phy_lcpa = res->start; @@ -3579,7 +3579,7 @@ static int __init d40_probe(struct platform_device *pdev) D40_NAME " I/O lcpa") == NULL) { ret = -EBUSY; d40_err(&pdev->dev, "Failed to request LCPA region %pR\n", res); - goto failure; + goto destroy_cache; } /* We make use of ESRAM memory for this. */ @@ -3595,7 +3595,7 @@ static int __init d40_probe(struct platform_device *pdev) if (!base->lcpa_base) { ret = -ENOMEM; d40_err(&pdev->dev, "Failed to ioremap LCPA region\n"); - goto failure; + goto destroy_cache; } /* If lcla has to be located in ESRAM we don't need to allocate */ if (base->plat_data->use_esram_lcla) { @@ -3605,14 +3605,14 @@ static int __init d40_probe(struct platform_device *pdev) ret = -ENOENT; d40_err(&pdev->dev, "No \"lcla_esram\" memory resource\n"); - goto failure; + goto destroy_cache; } base->lcla_pool.base = ioremap(res->start, resource_size(res)); if (!base->lcla_pool.base) { ret = -ENOMEM; d40_err(&pdev->dev, "Failed to ioremap LCLA region\n"); - goto failure; + goto destroy_cache; } writel(res->start, base->virtbase + D40_DREG_LCLA); @@ -3620,7 +3620,7 @@ static int __init d40_probe(struct platform_device *pdev) ret = d40_lcla_allocate(base); if (ret) { d40_err(&pdev->dev, "Failed to allocate LCLA area\n"); - goto failure; + goto destroy_cache; } } @@ -3631,7 +3631,7 @@ static int __init d40_probe(struct platform_device *pdev) ret = request_irq(base->irq, d40_handle_interrupt, 0, D40_NAME, base); if (ret) { d40_err(&pdev->dev, "No IRQ defined\n"); - goto failure; + goto destroy_cache; } if (base->plat_data->use_esram_lcla) { @@ -3641,7 +3641,7 @@ static int __init d40_probe(struct platform_device *pdev) d40_err(&pdev->dev, "Failed to get lcpa_regulator\n"); ret = PTR_ERR(base->lcpa_regulator); base->lcpa_regulator = NULL; - goto failure; + goto destroy_cache; } ret = regulator_enable(base->lcpa_regulator); @@ -3650,7 +3650,7 @@ static int __init d40_probe(struct platform_device *pdev) "Failed to enable lcpa_regulator\n"); regulator_put(base->lcpa_regulator); base->lcpa_regulator = NULL; - goto failure; + goto destroy_cache; } } @@ -3665,13 +3665,13 @@ static int __init d40_probe(struct platform_device *pdev) ret = d40_dmaengine_init(base, num_reserved_chans); if (ret) - goto failure; + goto destroy_cache; base->dev->dma_parms = &base->dma_parms; ret = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE); if (ret) { d40_err(&pdev->dev, "Failed to set dma max seg size\n"); - goto failure; + goto destroy_cache; } d40_hw_init(base); @@ -3685,8 +3685,7 @@ static int __init d40_probe(struct platform_device *pdev) dev_info(base->dev, "initialized\n"); return 0; - -failure: + destroy_cache: kmem_cache_destroy(base->desc_slab); if (base->virtbase) iounmap(base->virtbase);