From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbbL1V5D (ORCPT ); Mon, 28 Dec 2015 16:57:03 -0500 Received: from mout.web.de ([212.227.17.12]:63988 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752566AbbL1V5B (ORCPT ); Mon, 28 Dec 2015 16:57:01 -0500 Subject: [PATCH] [media] au0828: Refactoring for start_urb_transfer() References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall To: linux-media@vger.kernel.org, Mauro Carvalho Chehab From: SF Markus Elfring Message-ID: <5681B01F.4070401@users.sourceforge.net> Date: Mon, 28 Dec 2015 22:56:47 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:EBbE1hBXuGz2pxq/OmcQr/1ChC2v1ajA0TTL9IdX8pyI5x9hq42 KuDl/Ha6rB+q0SO1iiTnlx+wKLd2k1X/s59au3LJMS+XqNOgtjk7lDXR/Z3BgyiJVNBaPGb cYl0pnKT0NaHPzHu3WPdVx9K/cWPFuojHISdfaykRyuyCk0oozV+PC1XALhtujbhi1XOVzE sTXJHjBvDO4CKX2i3L6qg== X-UI-Out-Filterresults: notjunk:1;V01:K0:GNQMzgUy2b4=:HIQVnVa4z//uWOHy2a3Xte +XNuEU7WpCUe0PAncYhVa29eT+LR0OEEexPNv0YaX2AwT8OQ8Q0Lp6NmFfbtobGtfe1hCqDEj /5F+eBGzImQnayZZj08L1jE1wNZdFkgmhgXDagsRW7Gkhjh5CTnPgO5prLX/TAtabKbqMgekt I//BhlvqnsThLoj9+kUQv5+jW2u9vO7H9QIuOYfqQY0G4SLkju5qoVmoCQmhKn32LGKgZDr1B 9m/HdvnMQZ+OLeuQbeR2UNxAjMt281QAaDuQ9a7yJhjf3IyoaK+gb3FlMEZpAkbHdEk1Cw3UQ duAMz731O4TCEFCPbhXlAezL2zvJ0lbNAT/CTEkqxBbddVuHdflIZCqskfq1ITUahKEuVDEWv HGbWUOBIXqnNLIpr9o/nIi95y7/0evFG1ChE/5Fh29IF8KgnQ+iwQY0DslDCR9tPWr1qZalmA nUM+ahW5ZPkB44UpBrXF0UdbU451Lo4Kh07KJieu5Wd3WXNXjbhgcsEtaNtjr3CJgZHhQdTzT blK8V+BUQermygU6h6SBBfvPvD+auA1rHIbWS9V7a6bwBeqrXsA8iTztbD7hi1BVjUlt4JSAW QjYbirHYejlcRHEG4mG5hd6R3wVooEx36x2XcDpyF9o6JgsaUQovf6tb8OSwuVlS754+enxK8 XS/KyioaUgYDTQxrMCQq2Ke/ftEyCC8arnlpfJQhI0eG/vGBTag7il6pi/mZ51MCof2p/0PYd rD4q3f+YGyeOwGsos3bWSbeXdDjEERCcY94OEzJnpwzecId8697xvXd3N8S+fHaXKayTu497n FW+KM3nvzjygDnZoDHH6l/2oT3ECg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 28 Dec 2015 22:52:48 +0100 This issue was detected by using the Coccinelle software. 1. Let us return directly if a buffer allocation failed. 2. Delete the jump label "err" then. 3. Drop the explicit initialisation for the variable "ret" at the beginning. 4. Return zero as a constant at the end. Signed-off-by: Markus Elfring --- drivers/media/usb/au0828/au0828-dvb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index cd542b4..e5f1e20 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -181,7 +181,7 @@ static int stop_urb_transfer(struct au0828_dev *dev) static int start_urb_transfer(struct au0828_dev *dev) { struct urb *purb; - int i, ret = -ENOMEM; + int i, ret; dprintk(2, "%s()\n", __func__); @@ -194,7 +194,7 @@ static int start_urb_transfer(struct au0828_dev *dev) dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL); if (!dev->urbs[i]) - goto err; + return -ENOMEM; purb = dev->urbs[i]; @@ -207,9 +207,10 @@ static int start_urb_transfer(struct au0828_dev *dev) if (!purb->transfer_buffer) { usb_free_urb(purb); dev->urbs[i] = NULL; + ret = -ENOMEM; pr_err("%s: failed big buffer allocation, err = %d\n", __func__, ret); - goto err; + return ret; } purb->status = -EINPROGRESS; @@ -235,10 +236,7 @@ static int start_urb_transfer(struct au0828_dev *dev) } dev->urb_streaming = true; - ret = 0; - -err: - return ret; + return 0; } static void au0828_start_transport(struct au0828_dev *dev) -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Mon, 28 Dec 2015 21:56:47 +0000 Subject: [PATCH] [media] au0828: Refactoring for start_urb_transfer() Message-Id: <5681B01F.4070401@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Mon, 28 Dec 2015 22:52:48 +0100 This issue was detected by using the Coccinelle software. 1. Let us return directly if a buffer allocation failed. 2. Delete the jump label "err" then. 3. Drop the explicit initialisation for the variable "ret" at the beginning. 4. Return zero as a constant at the end. Signed-off-by: Markus Elfring --- drivers/media/usb/au0828/au0828-dvb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index cd542b4..e5f1e20 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -181,7 +181,7 @@ static int stop_urb_transfer(struct au0828_dev *dev) static int start_urb_transfer(struct au0828_dev *dev) { struct urb *purb; - int i, ret = -ENOMEM; + int i, ret; dprintk(2, "%s()\n", __func__); @@ -194,7 +194,7 @@ static int start_urb_transfer(struct au0828_dev *dev) dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL); if (!dev->urbs[i]) - goto err; + return -ENOMEM; purb = dev->urbs[i]; @@ -207,9 +207,10 @@ static int start_urb_transfer(struct au0828_dev *dev) if (!purb->transfer_buffer) { usb_free_urb(purb); dev->urbs[i] = NULL; + ret = -ENOMEM; pr_err("%s: failed big buffer allocation, err = %d\n", __func__, ret); - goto err; + return ret; } purb->status = -EINPROGRESS; @@ -235,10 +236,7 @@ static int start_urb_transfer(struct au0828_dev *dev) } dev->urb_streaming = true; - ret = 0; - -err: - return ret; + return 0; } static void au0828_start_transport(struct au0828_dev *dev) -- 2.6.3