From patchwork Sat Sep 17 15:22:17 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: 9337195 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 7AADC60839 for ; Sat, 17 Sep 2016 15:22:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B52928CE0 for ; Sat, 17 Sep 2016 15:22:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F36E28CDF; Sat, 17 Sep 2016 15:22: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 11C4F28CDF for ; Sat, 17 Sep 2016 15:22:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752385AbcIQPWw (ORCPT ); Sat, 17 Sep 2016 11:22:52 -0400 Received: from mout.web.de ([212.227.17.12]:51235 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751970AbcIQPWv (ORCPT ); Sat, 17 Sep 2016 11:22:51 -0400 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MQvgI-1bZgKg3M0k-00UIS4; Sat, 17 Sep 2016 17:22:20 +0200 Subject: [PATCH 13/24] ste_dma40: Rename a jump label in d40_alloc_chan_resources() 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: <76bb4f48-c690-ccbb-91aa-ee57a769799a@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:22:17 +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:42DHyZ9iV0Ap0I1lcxl0gcEzQF/kvltyB+MizqcFejB3nEC+AP4 1B31qLN2qpl9cjwhkXxUKOcvEq/5hjJ1RwxcRBmSMpCjHfLI5kbvcKQWq57vbKFY2o4TBO1 FPbWfQ6fF4AvEOxs+pNySHGkGHgs9j9weqO2qWLICw03A/ln6FweVoUOAl8PcMbdnWlAhP6 S/aMJiw9hwrbCtXE9OIwg== X-UI-Out-Filterresults: notjunk:1; V01:K0:iRoawc1WOD8=:ZRkzwPDxOvTM3i6/h3oqAb K6ZvvPDoUQww5bu2bw5bzRAxFfOhA1uGa3hFO5oyWApz5MJxXImntMCa7CNJaYh+OJ9V4WOB5 nmVVr/A4WRCGuImsnrkvOX5MJVe35vEz2keUtttupA683p60KhjfuvFNDo2I/NHeg0ilG7sTi FuQROPlZoAQxMif03JStHeh37Q1NQ8/QSlIWLz8kRp/RvCQOADJTRblooV+RNUpmWg9H5Kqu7 1n7W4s9sUlVlnUKL7I1BgbXP+Cf2mV4r0NVbz3Nop6KAa9QavCehy7qNwy56BthPThuaOBGAO 7GynJ7Q0crbgORygwBecOuA+ZJOhAGEclK2oJY9b/4NBbuK7oFhK3+XGUJiQDaPBjQeBe7Iq1 23qcKLUH2IVGaPWcCBgef/OUSNNBuoDZmbI5nJeKyJ7MfnMIAiX017+VLQlLqtGmIJ2OPtd8y wUbUiTJVnhkc9yky2l5cVgRk+s1FDOHQ4cyIpReQjKiwU/MqI6XvS5u7FLX0KyBM5Yrna5V/z +FVWB6J0jXLldTzRhWf1q+kl102WPWL6OSE/dSGNSI1CIneIDMhQbM9S0q4/IfUB3xufS6qLF QZ/2z5uLVHi0cpZCUuIcfeSXY53+uIXX0CztwJCLpjR73e429N6UbSF3Igq/HDkRcHX0l5BqJ ZCfr3YIGuGLGZu5ur8B7pytFpqV6d0DbZaCO+hMIyb2plXBsEbLbLB/0jiLvD6lLSA1zJwAqg zSnf9l6egWjJxN28jFxbQl04LoLeTz8Hw0eH/eCTePiyCV9Pb4S/l0lfvicahfZNhw9J+50+1 1jLET/0 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 15:15:15 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/dma/ste_dma40.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index c7b73f1..0788add 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2424,7 +2424,7 @@ static int d40_alloc_chan_resources(struct dma_chan *chan) err = d40_config_memcpy(d40c); if (err) { chan_err(d40c, "Failed to configure memcpy channel\n"); - goto fail; + goto mark_last_busy; } } @@ -2432,7 +2432,7 @@ static int d40_alloc_chan_resources(struct dma_chan *chan) if (err) { chan_err(d40c, "Failed to allocate channel\n"); d40c->configured = false; - goto fail; + goto mark_last_busy; } pm_runtime_get_sync(d40c->base->dev); @@ -2466,7 +2466,7 @@ static int d40_alloc_chan_resources(struct dma_chan *chan) */ if (is_free_phy) d40_config_write(d40c); -fail: + mark_last_busy: pm_runtime_mark_last_busy(d40c->base->dev); pm_runtime_put_autosuspend(d40c->base->dev); spin_unlock_irqrestore(&d40c->lock, flags);