From patchwork Sat Sep 17 15:09:44 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: 9337133 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 2FD2B60839 for ; Sat, 17 Sep 2016 15:10:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FF72275A2 for ; Sat, 17 Sep 2016 15:10:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10BB728C4E; Sat, 17 Sep 2016 15:10:21 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC62E275A2 for ; Sat, 17 Sep 2016 15:10:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109AbcIQPKT (ORCPT ); Sat, 17 Sep 2016 11:10:19 -0400 Received: from mout.web.de ([212.227.17.12]:59169 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbcIQPKT (ORCPT ); Sat, 17 Sep 2016 11:10:19 -0400 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MXHXF-1bWeGV391h-00WDu6; Sat, 17 Sep 2016 17:09:46 +0200 Subject: [PATCH 03/24] ste_dma40: Rename a jump label in d40_lcla_allocate() 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> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <44b5c6a8-3e6d-573c-c556-a8036d25d3e4@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:09:44 +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:Qmtba/5rVB1AuYc4Z7s3To0DM3ZYFAWT1uD3q3LensPDerPMQud YSl09bZh0V7kEsK/6w61ahzTQ0ZAxD/MWLspu5eiU4BU2fjlAV8L07f+Ee7LrWsozKKQV+y mYT9q6nhdh5r3DeHg8Er4rRhy4+tstpO0EV58lQOgAuKeesV9XgP0g3eDJfZMj6Ti53LKw+ niyIE0ZuEQf6O7ZK4AeLQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:2I7aDe4Mss4=:Nu3PrbjmBYuUgpWl/4oefC Uadzz2jx29qTQqM9R56v5t5r1Oj1nT4m72zySOWEL57RhrkiysN54/+SXnCAsb9eTtCrrr4sn h0hlBRHT9InOFOU2edZXfkV9UpDCFJFQgD/udZTTdk89byLMh2FsAvbsjaCrlS6bXuysXaE5Y tcmaTGbHotlm4gZoK5gr+EnFrnQtXRZIwvgHx6DNEH6eciMkXgoELlsqVRii0GYL1AWL+UK0Q fQrtEdgjScDpBu05LSrmoHZeEpnDwQ4W0Jv1A5+ltF3HMwy/+WcffdqBh5G10Yv7ceXYwcRyt CrIdBdKFmIHj0q9nj1jVWaCxGryJBAnY7vvOhiVUwK4BmvKS/oX9rqeoWh0oN9z9vNkZXN36X OtpPjofFcJ3iL47Yl3NU4FicXXT9cPtD10Id3qF6D9sgROoFfl9medR9M3CysGgtwf3m6mnQm Uoo1oaMZ+UjWaaMbtJ6EAWkFkJsVbFcY2JbB32H91g9mkpKmBAiEBdHRx+X5VwRn+wuNq+XcC 7YihlREIsH8Z6mwZkSBr6PzKcpD4fS4x7acxfDcDb/mH+V7utWrX2YUg4boM55CGUoC28uqkV WX7nSAlIWWNwAglPLjovRDxfEvu7Iz3j/0vdrErU0iuQFlnZvDGFNof2Vb1pM/F1veOkJAFgL +Txkx/3b+/X8p7j+yT/sbMvbx1XCr4+SyTjcV+pP3dblX5M0qe6GVUbVMpIXPjXin13r/7+B3 gGAzUhtCmDmWnLevubk7+UNam+lehYWvbVUC2cYTqpVdWsW3aeje+l8kFNgGDUboAweXL6XAC w6KbsRs Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 17 Sep 2016 08:23:37 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 80a199a..76d63b6 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3429,7 +3429,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) for (j = 0; j < i; j++) free_pages(page_list[j], base->lcla_pool.pages); - goto failure; + goto free_page_list; } if ((virt_to_phys((void *)page_list[i]) & @@ -3456,7 +3456,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) GFP_KERNEL); if (!base->lcla_pool.base_unaligned) { ret = -ENOMEM; - goto failure; + goto free_page_list; } base->lcla_pool.base = PTR_ALIGN(base->lcla_pool.base_unaligned, @@ -3469,12 +3469,12 @@ static int __init d40_lcla_allocate(struct d40_base *base) if (dma_mapping_error(base->dev, pool->dma_addr)) { pool->dma_addr = 0; ret = -ENOMEM; - goto failure; + goto free_page_list; } writel(virt_to_phys(base->lcla_pool.base), base->virtbase + D40_DREG_LCLA); -failure: + free_page_list: kfree(page_list); return ret; }