From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751822AbdJ1U4j (ORCPT ); Sat, 28 Oct 2017 16:56:39 -0400 Received: from mout.web.de ([212.227.17.12]:61987 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751446AbdJ1U4h (ORCPT ); Sat, 28 Oct 2017 16:56:37 -0400 To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, UNGLinuxDriver@microchip.com, Woojung Huh Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] lan78xx: Use common error handling code in lan78xx_phy_init() Message-ID: <1aa46505-686c-8e92-78a8-b2a562ccbb9d@users.sourceforge.net> Date: Sat, 28 Oct 2017 22:56:31 +0200 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:snOeEDQ9F3IrOdVC+ubYzO+ao0VLUSzsGuJELCarcJoSZ7PXagq 7w6OQgl/Bshsv+QW3kzUaj3YNzp6H6tBXmSs0i9qLbQH+v7S5wkb6brTsIA85wvnj+vawSt ozzm8aUkFboGzQrVKm38qmtjWdV62n10N5NBFkun9hQi650lSm/pweeuSECiFUhNCNf4Krh AkIPS0Ztk+OAlDbxMrsTQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:PVrqJ/jRm50=:M4dkJZjDFl3nbCmZTPnlT6 aqJnWgsvI9ISBkaSEyDM/uYf2ruJvStG84jg+GMa6wBvcw3Yp2sbh9iKMbdukMbfSO3io3kE+ mctGdHUePd4j/2AVydwDmBDY8gpbWUpTDZ1Xyi7QumrVoyev8DBK1B5Khfu0eEj77YsEkAM2S r1jl7tRc5DsYdfkpEVX4/fZZcMpEVFNKXOO05884Ra8b+emSMpmykUkNwmCNLFu7VNLuppbnR /+pn1aeJ1bCVkNviFBajWiY1ihQZ85jXvj08f13pRa3EaPHHPYzwBK9safCjOoyWExj5TrZWM Z+CIaxJHAowSuh9X4GD5vSblPcRY+uJK7L38P8dfBY6d71205ZDT/FL795W/wrb0aq4NaKxvI PTnGvV6ne7VH6V/yBZF6oxwIMdUpmhycaA3tUoSqLXEnA4x0698kSj9MOprQDLxzm4t9mz2ws O9QunU1qyy3QrHzAgXd88mF46fjrKtQtciqCWQ0vNqRr/rqEWhi5o4/j4XJf+sNOjHHgidEnk lmkUkOS+mHhvLhvhxhu6Dlg5Lk8Di4WKmYalOXw4yhz34Xo7IO3iCdQGtPQipwSMBqW6gL5rX LqrXSpo6WwBy1CZhr714gJ513knLegjs/06RoVKCUvSVkX1tIv/MVv4aVi4SbnnbDxp6KjJlT eu30TZvAMUN3wObj8+TQtDB4Y5Z32yR07ZEyxsQ+438XFGh1T4OsG6fVfT5EDe1LcOIK5Hx0v Vs0ZDMbdPd/YX99x1fF8oiIOkAUMmS9+w1rZxbZOWN01pTmtz47UYPoBfMFWegrO+Lv66bmlB Im+3ED39a4lbAM26Oruu73gssLDAcQW5q1+G6UEcYk5YEoFz0I= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 28 Oct 2017 22:42:52 +0200 * 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. * Adjust two condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/usb/lan78xx.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 0161f77641fa..ff07e20621e3 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2030,17 +2030,15 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) /* external PHY fixup for KSZ9031RNX */ ret = phy_register_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0, ksz9031rnx_fixup); - if (ret < 0) { - netdev_err(dev->net, "fail to register fixup\n"); - return ret; - } + if (ret) + goto report_fixup_failure; + /* external PHY fixup for LAN8835 */ ret = phy_register_fixup_for_uid(PHY_LAN8835, 0xfffffff0, lan8835_fixup); - if (ret < 0) { - netdev_err(dev->net, "fail to register fixup\n"); - return ret; - } + if (ret) + goto report_fixup_failure; + /* add more external PHY fixup here if needed */ phydev->is_internal = false; @@ -2093,6 +2091,10 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) phy_unregister_fixup_for_uid(PHY_LAN8835, 0xfffffff0); return ret; + +report_fixup_failure: + netdev_err(dev->net, "fail to register fixup\n"); + return ret; } static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size) -- 2.14.3