diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-17 13:39:31 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-19 12:52:34 -0800 |
| commit | 760fa78f3509d3d414804c4017de3d0dba995081 (patch) | |
| tree | b4eda0dd8c1251ec275b4c1ab2f7dae55f8044dc | |
| parent | net: phy: marvell: initialise link partner state earlier (diff) | |
| download | linux-dev-760fa78f3509d3d414804c4017de3d0dba995081.tar.xz linux-dev-760fa78f3509d3d414804c4017de3d0dba995081.zip | |
net: phy: marvell: use positive logic for link state
Rather than using negative logic:
if (there is no link)
set link = 0
else
set link = 1
use the more natural positive logic:
if (there is link)
set link = 1
else
set link = 0
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/marvell.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b50c8a4710b4..5900281f4c2c 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -174,7 +174,6 @@ #define ADVERTISE_PAUSE_FIBER 0x180 #define ADVERTISE_PAUSE_ASYM_FIBER 0x100 -#define REGISTER_LINK_STATUS 0x400 #define NB_FIBER_STATS 1 MODULE_DESCRIPTION("Marvell PHY driver"); @@ -1327,10 +1326,10 @@ static int marvell_update_link(struct phy_device *phydev, int fiber) if (status < 0) return status; - if ((status & REGISTER_LINK_STATUS) == 0) - phydev->link = 0; - else + if (status & MII_M1011_PHY_STATUS_LINK) phydev->link = 1; + else + phydev->link = 0; } else { return genphy_update_link(phydev); } |