lkml.org 
[lkml]   [2018]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 10 Mar 2018 18:22:43 +0100

    Adjust a jump target so that a bit of common code can be better reused
    at the end of this function.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/net/usb/ax88179_178a.c | 34 +++++++++++-----------------------
    1 file changed, 11 insertions(+), 23 deletions(-)

    diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
    index f32261ecd215..e4b0baa98e9a 100644
    --- a/drivers/net/usb/ax88179_178a.c
    +++ b/drivers/net/usb/ax88179_178a.c
    @@ -689,49 +689,37 @@ static int ax88179_chk_eee(struct usbnet *dev)
    eee_cap = ax88179_phy_read_mmd_indirect(dev,
    MDIO_PCS_EEE_ABLE,
    MDIO_MMD_PCS);
    - if (eee_cap < 0) {
    - priv->eee_active = 0;
    - return false;
    - }
    + if (eee_cap < 0)
    + goto set_inactive;

    cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
    - if (!cap) {
    - priv->eee_active = 0;
    - return false;
    - }
    + if (!cap)
    + goto set_inactive;

    eee_lp = ax88179_phy_read_mmd_indirect(dev,
    MDIO_AN_EEE_LPABLE,
    MDIO_MMD_AN);
    - if (eee_lp < 0) {
    - priv->eee_active = 0;
    - return false;
    - }
    + if (eee_lp < 0)
    + goto set_inactive;

    eee_adv = ax88179_phy_read_mmd_indirect(dev,
    MDIO_AN_EEE_ADV,
    MDIO_MMD_AN);
    -
    - if (eee_adv < 0) {
    - priv->eee_active = 0;
    - return false;
    - }
    + if (eee_adv < 0)
    + goto set_inactive;

    adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
    lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
    supported = (ecmd.speed == SPEED_1000) ?
    SUPPORTED_1000baseT_Full :
    SUPPORTED_100baseT_Full;
    -
    - if (!(lp & adv & supported)) {
    - priv->eee_active = 0;
    - return false;
    - }
    + if (!(lp & adv & supported))
    + goto set_inactive;

    priv->eee_active = 1;
    return true;
    }
    -
    +set_inactive:
    priv->eee_active = 0;
    return false;
    }
    --
    2.16.2
    \
     
     \ /
      Last update: 2018-03-10 19:25    [W:3.200 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site