From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338AbdKDVIo (ORCPT ); Sat, 4 Nov 2017 17:08:44 -0400 Received: from mout.web.de ([212.227.17.11]:57549 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbdKDVIm (ORCPT ); Sat, 4 Nov 2017 17:08:42 -0400 To: bcm-kernel-feedback-list@broadcom.com, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Felipe Balbi , Florian Fainelli , Greg Kroah-Hartman , Kevin Cernekee Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] usb: gadget: bcm63xx_udc: Use common error handling code in bcm63xx_udc_probe() Message-ID: <73cacf30-3380-0a77-559c-1ad824fb88eb@users.sourceforge.net> Date: Sat, 4 Nov 2017 22:08:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:UfP135pbXnK9cVZzglLWbIF1wqX+Zk//58Mq9F040zv93TlcVCB DtZrag3X9XDNW0EkBnfQ3dDDojw4zcuBHbJWI2zvUVhHBbx51anzNfzSxSWkocDqyeG2A6/ 8zqLfNaF4X5siu+iuuLG2PkTNsXjDah5RSWs50hxGzsxEQOWv4N3/QfXbJRqGW2zGOFCXbk IStnBHFsGVxXeRC6/j9gw== X-UI-Out-Filterresults: notjunk:1;V01:K0:CEilJ+w8w6E=:Xu30oiYJ/zxx0vRQRCTv5z 7aYi8vjJnmXZ8pO9BpK12f+CMjkw71hn6pfHmwAnWS6D3x0NTYXqqqDQUmT1evJa4ES0MNmgo UMvLNyEPgafTXToWT6hUX0pKAt78NFtIoav7LQocIIdF7+WDa8s8NLG5UmKKICbxY/aoDnCXr PUo8LU3KngLnIlPOAtZj6wvHNdNSAbHWpNyFfXiA3GcrRV4xpbIj9qHnYmRzTqAu7eEt25zaj Hmy+wQfv2mZ7UBEJMbohhSNiOFgt44+9VqKLS2o+gKPLueyF9PMmQqtrI4xqHNrYksFBshbP2 zttHvYW/BE+LkD9PKHWqR9KoALjIMkMkO5CR6KqCA6aLSBn+w0BkQZwxYzYEG46vtp+MYmTeN jH5tTCUpAqgqrjYgfBUnQg1qsRt2hdypzXZJZgliaTnjji/lJcBAhBCAlDiEFRxbgn/SAyBbM d+PF9YlYuJXtx7jAPFerspDxqo/aX+1DEE2cPFVfdlXY1Fb8b4V1Tdek2jowtw7ow6D98pdOs 6CNc7PEQ++vbVJDXe4s0EwvayJdF8VH7gzD0rezzLHb3J3t9aiy4hHUGbgob2WbDxNNWCkTx3 S5VLm7wQwvGMhcqQONSEo1n5thp8XZPtw8iOPPfq7s4RyHq2xUJrTqJX9UOlET6VMc+D7ERdB V0Y41cOPcafi+fYIC599atKD+YTCVNDTlQ0DzN+htUYMLf/MbiEzen0fUMtL9cBPV9v8+uSLS Pnx3eU5KI1TK456KcXmi/Tp46CJbNcASxfqhzyNP0aNmiCPNmILJ2OHwDRWwm3KQ2qYrnOPfJ DuXvB0G3feCuR6075TWCEGLwegE/yGmNj/8aTXm3Z8yPlJwYW0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 4 Nov 2017 22:02:46 +0100 Add a jump target so that a specific error message is stored only once at the end of this function implementation. Replace two calls of the function "dev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/usb/gadget/udc/bcm63xx_udc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c index f78503203f42..e3caae9c1ea9 100644 --- a/drivers/usb/gadget/udc/bcm63xx_udc.c +++ b/drivers/usb/gadget/udc/bcm63xx_udc.c @@ -2389,10 +2389,8 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) goto out_uninit; } if (devm_request_irq(dev, irq, &bcm63xx_udc_ctrl_isr, 0, - dev_name(dev), udc) < 0) { - dev_err(dev, "error requesting IRQ #%d\n", irq); - goto out_uninit; - } + dev_name(dev), udc) < 0) + goto report_request_failure; /* IRQ resources #1-6: data interrupts for IUDMA channels 0-5 */ for (i = 0; i < BCM63XX_NUM_IUDMA; i++) { @@ -2402,10 +2400,8 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) goto out_uninit; } if (devm_request_irq(dev, irq, &bcm63xx_udc_data_isr, 0, - dev_name(dev), &udc->iudma[i]) < 0) { - dev_err(dev, "error requesting IRQ #%d\n", irq); - goto out_uninit; - } + dev_name(dev), &udc->iudma[i]) < 0) + goto report_request_failure; } bcm63xx_udc_init_debugfs(udc); @@ -2417,6 +2413,10 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) out_uninit: bcm63xx_uninit_udc_hw(udc); return rc; + +report_request_failure: + dev_err(dev, "error requesting IRQ #%d\n", irq); + goto out_uninit; } /** -- 2.15.0