From patchwork Sat Sep 17 15:26:56 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: 9337219 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 8C1816077F for ; Sat, 17 Sep 2016 15:27:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E2D828D18 for ; Sat, 17 Sep 2016 15:27:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72B5628D1B; Sat, 17 Sep 2016 15:27:35 +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 0773728D18 for ; Sat, 17 Sep 2016 15:27:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752164AbcIQP1e (ORCPT ); Sat, 17 Sep 2016 11:27:34 -0400 Received: from mout.web.de ([212.227.17.11]:64088 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbcIQP1d (ORCPT ); Sat, 17 Sep 2016 11:27:33 -0400 Received: from [192.168.1.2] ([78.48.101.40]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MK20H-1bjubd3mkv-001TX8; Sat, 17 Sep 2016 17:26:57 +0200 Subject: [PATCH 16/24] ste_dma40: Rename a jump label in d40_prep_desc() 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: <4879ed44-9a6a-856d-a108-7d8f1934e2a0@users.sourceforge.net> Date: Sat, 17 Sep 2016 17:26:56 +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:c1SeAvUlmE6qA5P/H+Nkk+hUEox/D7fQbt2s3wvoxNdYPAGHQQX 0BkpVe9VgEqBy4Lx6ELGRSUQnV9q6XPW94pzKSJHrtzFx4tUkG0QHuBxO28/6jxhHm06Ihe SMIzyacmB73J9B0I0ThKBxar3EFrK96wKgxiyNVjw/I/Xtynw1NPQNDVadaQ6Pmqhf+BXXP AKQksRPezRLhX3Ysxg0NA== X-UI-Out-Filterresults: notjunk:1; V01:K0:EiDNdJQhxls=:sNjmbXMV4tOUYGzOCLKZeJ 26+PeHD2OeeyxKgrhJgWHdZz0p0DWER9MPGWBN+ZA2mQDC0uHpOiEGbfJOnKSUYj2LViS0xTr naHP2t+Jy3MeKmqdEdDYxzqzf7UUEeRSYKfBQmQ38aW7TAeJgKlPfdyn6FxN+qEZCcyTxdQ+s GUY/Iixx4dlU1OjWT/OSfV6x8S6DgKkP4v3J0XnGDHBT2nrxgRRXEMWPQzgs2Llfyf8PJFvEB dIMqjD3BDk69GQLXjo6bWSm7xfLPtzQB+m2zsUtdcXWUkKwApxJCemuWV3Sf+W1A/izpF2Vb+ vZbuWfXCsnVAIEZnH2lKMb6yjtgmpMZwZXSuhMkJm2P6VWLDx7MN3f4udjHmBKAldceOF9DCw nrugWzfvzMdVHlmflCkHYRz09133i400ScSoj3XrbOShq/nemys0puU1lgXfWJ9cvbasK2H+2 MqPDAPwKg3bUuuOwBVri/dfYKNfG4nhVHPXjcxqbNBUxZZD4lcnrhXx7Htoz5tHJU2flleGYz 6HTMmbrUW62Ed5PFFqw/YzmjRQN2hvuuVB4k2+NLvGd4M39deoJHhRsS5Mm/qQP+2sVVa/OUf 1BVyMMs9jtYG1Vigyxu+8HdVO9FlY2gz32wUlHAaundXOv+8EakCrozikUljNr/2uF1Gr+6QF 7uahxKPAGD24p1XGwKt1vhq1wB4hQpYPDIG28no5SkQowXExAzMSotBJIxI3VvaI+d4KMyFz/ KUqbPfUeyiKW8zLb/DsC5FeBDePFMEzq+1czQcxLeuiVcx1P3EqxMfQy10yTXh705J08h6OBP h+WRsVU 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:51:37 +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 6725b66..7f38496 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2208,13 +2208,13 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, cfg->dst_info.data_width); if (desc->lli_len < 0) { chan_err(chan, "Unaligned size\n"); - goto err; + goto free_desc; } ret = d40_pool_lli_alloc(chan, desc, desc->lli_len); if (ret < 0) { chan_err(chan, "Could not allocate lli\n"); - goto err; + goto free_desc; } desc->lli_current = 0; @@ -2224,8 +2224,7 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, dma_async_tx_descriptor_init(&desc->txd, &chan->chan); return desc; - -err: + free_desc: d40_desc_free(chan, desc); return NULL; }