lkml.org 
[lkml]   [2019]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] net: phy: at803x: stop switching phy delay config needlessly
    Date
    This driver does a funny dance disabling and re-enabling
    RX and/or TX delays. In any of the RGMII-ID modes, it first
    disables the delays, just to re-enable them again right
    away. This looks like a needless exercise.

    Just enable the respective delays when in any of the
    relevant 'id' modes, and disable them otherwise.

    Also, remove comments which don't add anything that can't be
    seen by looking at the code.

    Signed-off-by: André Draszik <git@andred.net>
    CC: Andrew Lunn <andrew@lunn.ch>
    CC: Florian Fainelli <f.fainelli@gmail.com>
    CC: Heiner Kallweit <hkallweit1@gmail.com>
    CC: "David S. Miller" <davem@davemloft.net>
    CC: netdev@vger.kernel.org
    ---
    drivers/net/phy/at803x.c | 26 ++++++--------------------
    1 file changed, 6 insertions(+), 20 deletions(-)

    diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
    index 222ccd9ecfce..2ab51f552e92 100644
    --- a/drivers/net/phy/at803x.c
    +++ b/drivers/net/phy/at803x.c
    @@ -257,35 +257,21 @@ static int at803x_config_init(struct phy_device *phydev)
    * after HW reset: RX delay enabled and TX delay disabled
    * after SW reset: RX delay enabled, while TX delay retains the
    * value before reset.
    - *
    - * So let's first disable the RX and TX delays in PHY and enable
    - * them based on the mode selected (this also takes care of RGMII
    - * mode where we expect delays to be disabled)
    */
    -
    - ret = at803x_disable_rx_delay(phydev);
    - if (ret < 0)
    - return ret;
    - ret = at803x_disable_tx_delay(phydev);
    - if (ret < 0)
    - return ret;
    -
    if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
    phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
    - /* If RGMII_ID or RGMII_RXID are specified enable RX delay,
    - * otherwise keep it disabled
    - */
    ret = at803x_enable_rx_delay(phydev);
    - if (ret < 0)
    - return ret;
    + } else {
    + ret = at803x_disable_rx_delay(phydev);
    }
    + if (ret < 0)
    + return ret;

    if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
    phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
    - /* If RGMII_ID or RGMII_TXID are specified enable TX delay,
    - * otherwise keep it disabled
    - */
    ret = at803x_enable_tx_delay(phydev);
    + } else {
    + ret = at803x_disable_tx_delay(phydev);
    }

    return ret;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-09 02:58    [W:2.723 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site