From patchwork Sat Sep 17 15:33:20 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: 9337251 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 38CE66077F for ; Sat, 17 Sep 2016 15:33:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29A7B28DDE for ; Sat, 17 Sep 2016 15:33:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E73828DE6; Sat, 17 Sep 2016 15:33:54 +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 C104528DDE for ; Sat, 17 Sep 2016 15:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169AbcIQPdw (ORCPT ); Sat, 17 Sep 2016 11:33:52 -0400 Received: from mout.web.de ([217.72.192.78]:64114 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752164AbcIQPdw (ORCPT ); Sat, 17 Sep 2016 11:33:52 -0400 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0M6DuI-1aoWtv2De6-00yBqT; Sat, 17 Sep 2016 17:33:21 +0200 Subject: [PATCH 21/24] ste_dma40: Rename jump labels in d40_alloc_mask_set() 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: <759a5edb-0f6e-db86-6c8f-e0118467023d@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:33:20 +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:7OgYJL+vYczOtyz0CAPRDiWhXc4Si7FgV1jk4bT80QTwU6yTkGh 21vafA/ffbloQXs0xEq+Ch7Lutr2nErUT/8HmhsHq7fw/8AnI+BqJ27wiiDiVVmle5oCX90 Tk0gb7EWC5BKWTSZ5/W2QVzdA/jI+7kwwtUsMumXwtdrM5FitMLS1ct5D2BDBEXzKUJKXLE 5ymGveEFloqmgqnhH3Wnw== X-UI-Out-Filterresults: notjunk:1; V01:K0:WzNNNpK0xjs=:tngtPdMZKvgOwB7KzYuvUa S1CmU3HgwoTDRAnC3VtRcF25m08Qa2KGxQwhs0DM3Duzs6HRyjjAjLWJXNYxvY4fCskDBy8yR Y3pc/mYiH/M2gLFGJ28G4EPA1PrMAMrp2Bp5Uoabou4HSZM3sHueJRrp84hfa4sDrK/tsaWgI kYBzn8UVT+KdZi52X5ZE8ZQbFSf007/VIP/9caizXNUYUtSQ3NTmxu7Z8+Xg6WUOG/nluoFIu pfvAGIgQbzFYc9KW9HNlq8/nESj5O2HQvIY6Hw9mETLeeUZjry3Qhp98TGcQFUo6+zMzau3vr S64zOQWCrIkeGhz+eGiqYdVJ9/YAfRTR3EicJB4F7n4wEE5W20iEJQacxfVQZB+nTnMXIG8cu Bq/90FTGKFUuRnCEvQDJt8HZA+Bl/pYnWgyOWyXENZdi2eid9LLsDiSHHibjvkBkR9BUV2TBA 5Z/a9CwjksYerVuu288bdL5FUP+VskSzBlhqy8/GGjaeraTufif6moijG4kMrrllZGNzh1JPB rZhKdZAfZfvn+5Q047hkQXTxp5GTortyPtus6ctrwB8F0HcZQpqFHs4+9qRzU16rZv48pTNhc OKLWwZyRWHo7nmkLVi7OR3wVo7mAaWK03iEbdp7mj90pWB57lfn+68qXpFL/cOhoBiWM6LoWg GAt25cUFZT/vD38ExiTFPQwmBaUasTEP2KwUVozhTHETQ3m8lw0YOh+XxaOAdi+l5lsW565v4 XucpJfiOZ7zkHKY5RDRoL17n8zuXnxqrxpfBXapNmm99J4bOmLPGOMQlAym1utZ8RYpjLPRy/ VWEs/cO 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 16:16:42 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index fbe87a2..4a2f39b 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1778,42 +1778,40 @@ static bool d40_alloc_mask_set(struct d40_phy_res *phy, phy->allocated_dst == D40_ALLOC_FREE) { phy->allocated_dst = D40_ALLOC_PHY; phy->allocated_src = D40_ALLOC_PHY; - goto found; + goto found_unlock; } else - goto not_found; + goto not_found_unlock; } /* Logical channel */ if (is_src) { if (phy->allocated_src == D40_ALLOC_PHY) - goto not_found; + goto not_found_unlock; if (phy->allocated_src == D40_ALLOC_FREE) phy->allocated_src = D40_ALLOC_LOG_FREE; if (!(phy->allocated_src & BIT(log_event_line))) { phy->allocated_src |= BIT(log_event_line); - goto found; + goto found_unlock; } else - goto not_found; + goto not_found_unlock; } else { if (phy->allocated_dst == D40_ALLOC_PHY) - goto not_found; + goto not_found_unlock; if (phy->allocated_dst == D40_ALLOC_FREE) phy->allocated_dst = D40_ALLOC_LOG_FREE; if (!(phy->allocated_dst & BIT(log_event_line))) { phy->allocated_dst |= BIT(log_event_line); - goto found; - } else - goto not_found; + goto found_unlock; + } } - -not_found: + not_found_unlock: spin_unlock_irqrestore(&phy->lock, flags); return false; -found: + found_unlock: spin_unlock_irqrestore(&phy->lock, flags); return true; }