From patchwork Sat Sep 17 15:20:29 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: 9337193 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 49F0E60839 for ; Sat, 17 Sep 2016 15:22:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 388A428CDD for ; Sat, 17 Sep 2016 15:22:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D33A28CDF; Sat, 17 Sep 2016 15:22:19 +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=ham 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 B464428CDD for ; Sat, 17 Sep 2016 15:22:18 +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 1blHQQ-00024L-68; Sat, 17 Sep 2016 15:21:06 +0000 Received: from mout.web.de ([212.227.17.11]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1blHQI-0001rN-Qg for linux-arm-kernel@lists.infradead.org; Sat, 17 Sep 2016 15:21:00 +0000 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0Lcxxc-1bL3Ox0GMC-00iElZ; Sat, 17 Sep 2016 17:20:31 +0200 Subject: [PATCH 12/24] ste_dma40: Rename jump labels in d40_dmaengine_init() 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: <50af4724-d6a8-7e19-d5b1-c23c088b844b@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:20:29 +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:oVNL/KYTTsHdzY35dj6+NwOzv1LOU17sFZvQIwmoWcVjZTRyK2n JNE9zVGAIpFx7b7Ab2nbnCIYagv/KfExB6qqIQ8HCH9ss0VjUfp1gUuz4fsfOnHyYSoDlzs wu/EzlZhTxB/ItBsib9MwJMLdEDuAEMh4xZ5LTVg5x6rjKf7v3quRQwELH9fGPfjO1ptGhu l92UxX4cOu27OP7r+U7Jg== X-UI-Out-Filterresults: notjunk:1; V01:K0:3yBjuNkUmiQ=:8LHNAQk30zz3kN0vOD7GvJ OWPC30Pgx/GF9Fb8fhWPn/T1J/Aj/UKgWoBARUJUNn03i68YnV6bcg0k+/ukHO5SNVH17EGeA 73c5fglnGRaub4cSBIsb6cXVHAazCnQ0PyrP8VS1jQSsOBl/w+gZ/g+vEnagSkrpesXwtVxsr oGvf+hfJKwGssOzNV7Z2O5i7sRMEkavB9M1t13/4xhyajVC8HqkqaadKHAFq4MkDdC2L2aeRE zw0YeMpj1eUdwASVRiKeVBkjvSepuQ7boJe+b6d6YsCfMSYJY6wQBO9CoIurOiZ5vPotWmDtD iGj0vmE1uTXpVyXPoffzDpD2f0BMQ9uKDZITIVGmqOwwCk9hrUQtz1No58sab1Lx8Kmn3p46Y 51g5fCoc2AVS8E+KQGd2h/fXHIxf+BQkcajQr/DTbSqnd51/v36d3MBJLEKl1g2hKDZiGD1IB PfpndCBwm+j4u2lReNs4mGdjHLJJc2D4w2DEP3NX9+3GZ3zQXTBqCP6CBwFz67v0RDjle9knh 5QH9GHqbcsgkgn8TTwEUwohRAmBu+fz0MjGdU0c0dRKgQL/Fyweha6aZWYLErQhDWXGDwdS7R HAAI96MoAaFgTwyWUPkssTBKee1IZdDOEtyepUIXwt4T3w5ust8sfp1wP5Fppn63wPIcObTyD 4LiJzhpxjAAoMrd95flfymEQV9u8WkiayUkw10lQn9UICeOh1+Hzjhur9N61LsJ2eYeB5xOLP zgtpv+r0MP9RXxBEm/5qAFxdGOfyn49Xmq5VQtTtpe+GqBiUfyfy0rC+BLpwxmmMUhHy7cb40 gq4zvrg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160917_082059_388970_E3707491 X-CRM114-Status: UNSURE ( 8.86 ) X-CRM114-Notice: Please train this message. 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 15:10:15 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index ed96039..c7b73f1 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2889,7 +2889,7 @@ static int __init d40_dmaengine_init(struct d40_base *base, if (err) { d40_err(base->dev, "Failed to register slave channels\n"); - goto failure1; + goto exit; } d40_chan_init(base, &base->dma_memcpy, base->log_chans, @@ -2906,7 +2906,7 @@ static int __init d40_dmaengine_init(struct d40_base *base, if (err) { d40_err(base->dev, "Failed to register memcpy only channels\n"); - goto failure2; + goto unregister_slave; } d40_chan_init(base, &base->dma_both, base->phy_chans, @@ -2924,14 +2924,14 @@ static int __init d40_dmaengine_init(struct d40_base *base, if (err) { d40_err(base->dev, "Failed to register logical and physical capable channels\n"); - goto failure3; + goto unregister_memcpy; } return 0; -failure3: + unregister_memcpy: dma_async_device_unregister(&base->dma_memcpy); -failure2: + unregister_slave: dma_async_device_unregister(&base->dma_slave); -failure1: + exit: return err; }