From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751846AbdJ2KP0 (ORCPT ); Sun, 29 Oct 2017 06:15:26 -0400 Received: from mout.web.de ([212.227.15.14]:52216 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbdJ2KPX (ORCPT ); Sun, 29 Oct 2017 06:15:23 -0400 To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, UNGLinuxDriver@microchip.com, Steve Glendinning Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] smsc95xx: Use common error handling code in smsc95xx_write_eeprom() Message-ID: Date: Sun, 29 Oct 2017 11:15:08 +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:7Zq+mlspilgSYHE62sgW/UCs7dXf9ykAPlrL4+TEZqcsSV17jSm HszSbs7p3kXuDZ0gyDayi9oLRVT1/pnJ/oLOCJpRNV50mu6J+PN9NAfiWVihnmbr7Xa8Lmj i7ob9HQZ8g2FgZeMo2yX8okjjT34SXRmN7g8+mNO99CBvP45thDkhJpfr5Uminj1jGYsG2v BkrFsd7PdXGOg590+tbbA== X-UI-Out-Filterresults: notjunk:1;V01:K0:og6ans1rof4=:5J9ziJjBjxTo4LKcDSwh+H R/txG28kPoh+NfFWbuiY6Z5q4FrOEU4kV7mXlp7chIM2vtQbbWjdoLsLI1+lWzfwTITHwwUvT sB4V/37XWQW+mR3eCzIKk0BR6shpHrKAavH1DIpgWdCpF52Tn2TDaFM1I0/CXPN43/sWe1C/q rnMxmRCn+bmYofPmI/AJLOAmwmf+mrIp6hlK9ZDQnRuPOAlhVZYhIxM6kun4uJ32ZelPL3P0o euXpHhB6/7UdEhceR1M254vnsiOqK3hwHeBL5CLNlYpLRMNtFvro9IXBVc/3QHRYipkZRSyxN 6a1Um8hmbTFFXSCnzioO8cbtAL8PVGwKL+nhS+5Dh9CgZ40diOpZfX2kCh9hb49NfWnLerAwF 9q1+Mt9UgpO/vVpH2CMhebgOwgiIwhB2vEABlZtFHJZfiPB0ieEQh1O8MzZI4jINoXMjimZNG fwyWBWUWutE0BmLViEZlD3mJoNKiNdT1wAgNQSPkJsf6IousG1DBq5w8mHIuV3TL4d9QpoOkz E6cZnevUimCij5LNsWWhjt/D6v8AAZcfyqhiKMn0W3lBygDk7SCLqajd89xKcCyCJ5/zJsl9Q +couaBwM780qGko3DpHQDD8u8oU3jh0iOIWlU2OXcFjVBe0vRZptWXGa9rjuV97z51Q7PNYKo 8SLQYsO/fa+mmv+vwlXNxqsnMY1FvG3UQx3m0vA+PIBchMn7q9oneR/DKyJUAs8eYpNO0prua T+9bWnR/zwzj7I3Cy6sxd3mElXoBVZSl0y/HQnd4muvCuM/uf3tlJGJ3mvkg4/R4JM0Xv3+tK NscU5T7rdOSy5Nz0sfoU+uGhwptXmEAiUzzGyYpEAirOpqPz4A= 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:08:34 +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_warn" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/usb/smsc95xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 309b88acd3d0..6a82e8055e9d 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -399,10 +399,8 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length, /* Issue write/erase enable command */ val = E2P_CMD_BUSY_ | E2P_CMD_EWEN_; ret = smsc95xx_write_reg(dev, E2P_CMD, val); - if (ret < 0) { - netdev_warn(dev->net, "Error writing E2P_DATA\n"); - return ret; - } + if (ret < 0) + goto report_write_failure; ret = smsc95xx_wait_eeprom(dev); if (ret < 0) @@ -413,10 +411,8 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length, /* Fill data register */ val = data[i]; ret = smsc95xx_write_reg(dev, E2P_DATA, val); - if (ret < 0) { - netdev_warn(dev->net, "Error writing E2P_DATA\n"); - return ret; - } + if (ret < 0) + goto report_write_failure; /* Send "write" command */ val = E2P_CMD_BUSY_ | E2P_CMD_WRITE_ | (offset & E2P_CMD_ADDR_); @@ -434,6 +430,10 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length, } return 0; + +report_write_failure: + netdev_warn(dev->net, "Error writing E2P_DATA\n"); + return ret; } static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index, -- 2.14.3