From patchwork Sat Sep 17 15:31:23 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: 9337249 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 8BEA36077F for ; Sat, 17 Sep 2016 15:33:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D6BD28DDE for ; Sat, 17 Sep 2016 15:33:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7226128DE6; Sat, 17 Sep 2016 15:33: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 1629228DDE for ; Sat, 17 Sep 2016 15:33:19 +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 1blHaw-0001ut-6i; Sat, 17 Sep 2016 15:31:58 +0000 Received: from mout.web.de ([212.227.17.12]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1blHap-0001hp-KN for linux-arm-kernel@lists.infradead.org; Sat, 17 Sep 2016 15:31:53 +0000 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0Mg75d-1bNrQ63kyj-00NP0s; Sat, 17 Sep 2016 17:31:24 +0200 Subject: [PATCH 19/24] ste_dma40: Rename a jump label in d40_free_dma() 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: <7fb277bb-0967-792d-1d56-4375976afbf5@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:31:23 +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:tVvEhF7kw6lvMhfE7nk3HMhumh7PQVOAaLmfFaNypPMS0iqtu0Z ap1tF+3CbOaIWMHUFcPlkv8BFBBf0g7PyLVXf8ZKIfOD+1nqrqsa/9wVGj8x+LEo3M03iIU zaMCYrfhy015tAHK2LWsaeu+vKQMU7si1iQDmY4QlFq5zV7zAgXSX03Juo7xlP/MNlcDAoU 9HqZAMk3VJq4uvEU4hyZg== X-UI-Out-Filterresults: notjunk:1; V01:K0:j4+ed+q2pZY=:AQk6zvp1QnOt+N6MtYFkpn O3bbOL5YSXSFrXwUkhCx3dTLeqEyLUYi3hrEBIxxW7lxIfoFuL1o1Kjg5gvjlAAAuXytOA6qH dDJxWGQ9Ruzhd7X2+Reg5DES5EwtSAa1tR3xHEBlaFHKj6y+TRWxpPLDlNgMvJWF77R4BJ766 Rm98EZksx+omxV87q1+f2kifprQlRA/VtTT/vnLHPbX4RrYN69gBblQ0eRL/gqpaTWHkoU6Pu 57Yyv4G8jH0EoyalzenhXy5yqyV712mIdEBMVHkK0MeL6iDJSPOYC2V+Q8kltbNZCEBvoUnZ+ kGr9w4j4XH7SSjcjHeh1HzMZCpH6/dXR0TH+Z8pyDyQVydBxK0LclxQfepnMqAnaJHMnlMXDN nIkpsK5GRLJE7vYAytttN3mC51YpDTNLTZlxvBxjSUt25F8+78xgjL/UYTiOUfUri1Jrxi3r3 9ZwKQkfU2Ayl6qrIIZbcaBHN65Ebqn0dQoBPJ3HgiUkvUF4PJtTTom3jZGRq9ilfMJv/GZ+CQ 6NDiOSV8ZfNhynGsD9hCw58sQbSnv3xeRgsgIJ4szbQrdeX5Z9uBxyWCSYuo4gHxWwfVvEMBv tM09EV+CpI2BBW5bx6ueKgFo9Xm8bF8j4PqZ1Hbb3OZmnyHVqVunydA4EWca0BP0FeFL1mbEQ CdnM6TIPx+a8YmhI6V71GnWFyXFKEHOr7qu/bjufJku6YIHJrhb6M6amzdN8QWXZCbKJACZqx lFqALn+i3qFvUd5TL7zjh5SLIozqnjfyGVMP/BzLAuF7QnCN+BrccK6RYg7rrudAewexY4u1u Qdeki4X X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160917_083152_257717_0D699E9A X-CRM114-Status: UNSURE ( 8.83 ) 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 16:04:46 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index d99241c..917b24a 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2045,7 +2045,7 @@ static int d40_free_dma(struct d40_chan *d40c) res = d40_channel_execute_command(d40c, D40_DMA_STOP); if (res) { chan_err(d40c, "stop failed\n"); - goto out; + goto mark_last_busy; } d40_alloc_mask_free(phy, is_src, chan_is_logical(d40c) ? event : 0); @@ -2063,8 +2063,7 @@ static int d40_free_dma(struct d40_chan *d40c) d40c->busy = false; d40c->phy_chan = NULL; d40c->configured = false; -out: - + mark_last_busy: pm_runtime_mark_last_busy(d40c->base->dev); pm_runtime_put_autosuspend(d40c->base->dev); return res;