From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751920AbdJ2KqI (ORCPT ); Sun, 29 Oct 2017 06:46:08 -0400 Received: from mout.web.de ([212.227.15.14]:51459 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbdJ2KqG (ORCPT ); Sun, 29 Oct 2017 06:46:06 -0400 To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, =?UTF-8?Q?Bj=c3=b8rn_Mork?= , "David S. Miller" , Greg Ungerer , Liu Junliang , Philippe Reynes From: SF Markus Elfring Subject: [PATCH] sr9800: Use common error handling code in sr9800_phy_powerup() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <10f2b5a4-1dbd-2c4f-caaa-4225dff35296@users.sourceforge.net> Date: Sun, 29 Oct 2017 11:45:40 +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:j9SMHiI8onEQR6l08UWK5EhIv8UZzt/GWVSvPKPaHj1MJ0MU65g R4uttESXwQX9eJhQTRiUqEcvC3X3opCn1+TC0bgYaQX0byRSQVevJDO6NxPHH4bQP4hW4z4 mEXKPyk2rRKg5Z68NZYybzlgKmhkaQE2A0zkB3npIVp9T1JrmD36bsPcg6rZEsRYGlA64rP xNvmuSvXp3EjjHuRny7SQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:O8I+Q5spdu4=:M6GdPRvpHxkyqIOHZSCRJB skNhgWQQgzV03e7nDSS5JQ9HWFu2yqEzoGKYAtpn7kuBHly7w/eZTb6nUbBHg89CdJqjDq1hw wMRQAYs/VrHtCmOKGsoGQb2oQgttOCIY41cQRnQbzE+aGlHhIeJM5FXkLPrbgWZ+c6acYQO3v N3i1bvDA6GKNLChbm3dcrHmz8Ibx0KbwmytANEMqBXacR6QBWUi+l/KNB/a93oXeR2aD1WVgA kR6Yhq53tqElBKwxXsZTe8m7vaM60b9HM5taP5uaS8U3AWrhPVnr+xTVMfHae7ZFp+PO1pOvl XxWICdJtsbhrUz8AXVgx3nC7rJjjlP3ulathq97flRzrTtgOzluiQLDW2vXFTFUXAGwSF4M9r k/BVw/+040k5RO9mSvEL85/VlCOTajbUGXxhbn8xrYLNPp8umq7uRmE8fgIVSGvfc8CcEWeBS LW9s5+ag1dpTY6YtaB17rdNava5b76DPpMwCUiZtwsXb0G58WNfNF/F7DASj/rO+6lNmw+fFB Q94QPmNm2Vq7Km5CBKb1oMOfU9WYxMV6dMIz8Wg7GQYnWo3uIfUsXiI4oJbjvoi6Vomo8wCRl D3f2MpPSG+z/Im5tCbzLOPRx1OQRwaoMlxYzU3Km2VXMgJP1ZejlmpkPZbZ6hZLQzM5rmPMRF GxdUjUM2asCe2igvGmJBLX5FUO2/zM1kPep1+grjtUJrxaUIeqC2Bsk48GeGszATVIZ5VWx+t AQHEIU7O9fgH1+d5mtfuUsmZvtKZb9blfZPIbB1cRZo2/NPbHacCD0R8QJHKHc7L+0SXwzH4o od+7PSXA0GigxEp+0o+aVCTB5RRhr6LxfQXgg31sR75gkdUXmc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 29 Oct 2017 11:33:14 +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 "netdev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/usb/sr9800.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index 9277a0f228df..79cfa72c68ba 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -700,10 +700,9 @@ static int sr9800_phy_powerup(struct usbnet *dev) /* set the embedded Ethernet PHY in power-up state */ ret = sr_sw_reset(dev, SR_SWRESET_IPRL); - if (ret < 0) { - netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_reset_failure; + msleep(600); /* set the embedded Ethernet PHY in reset state */ @@ -716,12 +715,14 @@ static int sr9800_phy_powerup(struct usbnet *dev) /* set the embedded Ethernet PHY in power-up state */ ret = sr_sw_reset(dev, SR_SWRESET_IPRL); - if (ret < 0) { - netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_reset_failure; return 0; + +report_reset_failure: + netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); + return ret; } static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) -- 2.14.3