netdev - [PATCH 13/19] usbnet: smsc95xx: Replace smsc95xx_link_ok

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190103011040.25974-14-marex@denx.de>
Date:   Thu,  3 Jan 2019 02:10:34 +0100
From:   Marek Vasut <marex@...x.de>
To:     netdev@...r.kernel.org
Cc:     Marek Vasut <marex@...x.de>,
        "David S . Miller" <davem@...emloft.net>,
        Nisar Sayed <Nisar.Sayed@...rochip.com>,
        Woojung Huh <Woojung.Huh@...rochip.com>,
        Andrew Lunn <andrew@...n.ch>,
        Florian Fainelli <f.fainelli@...il.com>,
        linux-usb@...r.kernel.org
Subject: [PATCH 13/19] usbnet: smsc95xx: Replace smsc95xx_link_ok_nopm()

Replace the function with genphy_update_link(), since that's really
all that it is.

Signed-off-by: Marek Vasut <marex@...x.de>
Cc: David S. Miller <davem@...emloft.net>
Cc: Nisar Sayed <Nisar.Sayed@...rochip.com>
Cc: Woojung Huh <Woojung.Huh@...rochip.com>
Cc: Andrew Lunn <andrew@...n.ch>
Cc: Florian Fainelli <f.fainelli@...il.com>
Cc: linux-usb@...r.kernel.org
To: netdev@...r.kernel.org
---
 drivers/net/usb/smsc95xx.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index fa33eda61275..401662f28f01 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1427,16 +1427,11 @@ static int smsc95xx_link_ok_nopm(struct usbnet *dev)
 	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
 	int ret;
 
-	/* first, a dummy read, needed to latch some MII phys */
-	ret = phy_read(pdata->phydev, MII_BMSR);
-	if (ret < 0)
-		return ret;
-
-	ret = phy_read(pdata->phydev, MII_BMSR);
-	if (ret < 0)
+	ret = genphy_update_link(pdata->phydev);
+	if (ret)
 		return ret;
 
-	return !!(ret & BMSR_LSTATUS);
+	return pdata->phydev->link;
 }
 
 static int smsc95xx_enter_suspend0(struct usbnet *dev)
-- 
2.19.2