From patchwork Sat Sep 17 15:30:26 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: 9337243 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 284D76077F for ; Sat, 17 Sep 2016 15:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19D2028DDE for ; Sat, 17 Sep 2016 15:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E95728DE6; Sat, 17 Sep 2016 15:32:28 +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 CFDF228DDE for ; Sat, 17 Sep 2016 15:32:26 +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 1blHa9-0001Wt-11; Sat, 17 Sep 2016 15:31:09 +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 1blHa0-0001MB-Ns for linux-arm-kernel@lists.infradead.org; Sat, 17 Sep 2016 15:31:02 +0000 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MSaZk-1bbHhy3vIy-00RXeA; Sat, 17 Sep 2016 17:30:31 +0200 Subject: [PATCH 18/24] ste_dma40: Rename a jump label in d40_is_paused() 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: <73e6fdd1-7419-db64-a007-2e55178b8127@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:30:26 +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:HT+Uy3epKEQn0jnV766V9EZyGRxyDa9uE7jPWr99kmLlYJOHfI1 TSHQtmZI8vSMWecLQRgXdggKlG8olYtG17EdwREn98TzF1junPJsc+6NWxtupzxUjpn38xb DhOobvHeuFDa+DLbVUTuU3amEEqRTsBWRGpCX6inWIXRXYMa5Dp3rqPepbzc89dlbyyD9F4 9Km9xqiJQvMy34AgCziEg== X-UI-Out-Filterresults: notjunk:1; V01:K0:exggxOLq4e4=:Xv2uweevrn2mO+O8/Sc9i7 Tvr+Oyy3jxNnF/RiMzo08EqLWFWXGwot/+SNJ/PxCzJ7ZkWb8B/KYfDz0M19u4rYc6kqYsi7W 9V4LYfMQpWHRWlVfpQPQyTpGXYwBcIj9LxkM6FeU+skWVFmBd282yH1ksuvcxvCEYci9BgMp6 8qe9TI0QuXV1/7ETXQCBiFmB5KqcCuHBKPPvcSjG6ZKvNziqXsIOSNfVuNS/Bf7Y2BctpHX4Q flcNQcBT47y3ujah9XyFReFPMTwwJdK+0P7dyLe/YrQh7TpzOtikoVvMJewgXD9jA6LWTGwvD V20/nIUevqjOJln3uAdrqOcRfUT9l4mZgXvE429iPx2tQt9H1vjLiiMa0yBXGP9lwCy4BaP2u arNd6GP6Yxy0ijXVPYvBN5URU0/Iqe/Aw5dVSi/QzpYxffTylKOCxQbhflAIWricnb9JIGtRJ Lsc4I5lwqJyhiUhMb4uACthP+kylItotjEpsr0/4ZyKA15yvONbLDwdawbDRnBjIXvtukvGRH unImix052RVFN4GUrmJzKXnBIhiSmfZJJkN/sceiGahScsvI2mLf43g1N5HXHBdqRTD7crljx BDZuWSQFEvbgJ6Ju0pEeMTe6KCgtgnrVk4iUL1uqr391Tim2UJY4wcn+kDa/NpFq5SWF39YJ6 ivqupMg7Xs0C3BngS7/vUidbzDA9jZULG0e+aw561pzOAJvjAs2Rhsm4M5eprZLOIGUqzr2XR 455njgsvjBke8e7J0zzhRygDooeXpGjRN4qEX0M4UpZYIsaztTb+Tr3Hequ4OUFFvDv9K+j0c r+RlqqE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160917_083101_407018_6E36B335 X-CRM114-Status: UNSURE ( 8.14 ) 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:00:05 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 4a21778..d99241c 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2092,8 +2092,7 @@ static bool d40_is_paused(struct d40_chan *d40c) D40_CHAN_POS(d40c->phy_chan->num); if (status == D40_DMA_SUSPENDED || status == D40_DMA_STOP) is_paused = true; - - goto _exit; + goto unlock; } if (d40c->dma_cfg.dir == DMA_MEM_TO_DEV || @@ -2103,7 +2102,7 @@ static bool d40_is_paused(struct d40_chan *d40c) status = readl(chanbase + D40_CHAN_REG_SSLNK); } else { chan_err(d40c, "Unknown direction\n"); - goto _exit; + goto unlock; } status = (status & D40_EVENTLINE_MASK(event)) >> @@ -2111,7 +2110,7 @@ static bool d40_is_paused(struct d40_chan *d40c) if (status != D40_DMA_RUN) is_paused = true; -_exit: + unlock: spin_unlock_irqrestore(&d40c->lock, flags); return is_paused;