[net-next,4/8] smsc95xx: remove redundant link status checking

Message ID d6c3c83b3615391b555e11671094d0276348a67a.camel@microchip.com
State New
Headers show
Series
  • [net-next,1/8] smsc95xx: check return value of smsc95xx_reset
Related show

Commit Message

Andre.Edich@microchip.com June 29, 2020, 1:11 p.m.
Current driver supports PAL that does link status checking anyway.

Signed-off-by: Andre Edich <andre.edich@microchip.com>

---
 drivers/net/usb/smsc95xx.c | 55 --------------------------------------
 1 file changed, 55 deletions(-)

 	u32 chip_id;
 	u32 mac_cr;
@@ -64,8 +62,6 @@ struct smsc95xx_priv {
 	u8 suspend_flags;
 	u8 mdix_ctrl;
 	bool link_ok;
-	struct delayed_work carrier_check;
-	struct usbnet *dev;
 	struct mii_bus *mdiobus;
 	struct phy_device *phydev;
 };
@@ -636,44 +632,6 @@ static void smsc95xx_status(struct usbnet *dev,
struct urb *urb)
 			    intdata);
 }
 
-static void set_carrier(struct usbnet *dev, bool link)
-{
-	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-
>data[0]);

-
-	if (pdata->link_ok == link)
-		return;
-
-	pdata->link_ok = link;
-
-	if (link)
-		usbnet_link_change(dev, 1, 0);
-	else
-		usbnet_link_change(dev, 0, 0);
-}
-
-static void check_carrier(struct work_struct *work)
-{
-	struct smsc95xx_priv *pdata = container_of(work, struct
smsc95xx_priv,
-						carrier_check.work);
-	struct usbnet *dev = pdata->dev;
-	int ret;
-
-	if (pdata->suspend_flags != 0)
-		return;
-
-	ret = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMSR);
-	if (ret < 0) {
-		netdev_warn(dev->net, "Failed to read MII_BMSR\n");
-		return;
-	}
-	if (ret & BMSR_LSTATUS)
-		set_carrier(dev, 1);
-	else
-		set_carrier(dev, 0);
-
-	schedule_delayed_work(&pdata->carrier_check,
CARRIER_CHECK_DELAY);
-}
-
 /* Enable or disable Tx & Rx checksum offload engines */
 static int smsc95xx_set_features(struct net_device *netdev,
 	netdev_features_t features)
@@ -1363,11 +1321,6 @@ static int smsc95xx_bind(struct usbnet *dev,
struct usb_interface *intf)
 	dev->net->min_mtu = ETH_MIN_MTU;
 	dev->net->max_mtu = ETH_DATA_LEN;
 	dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-
-	pdata->dev = dev;
-	INIT_DELAYED_WORK(&pdata->carrier_check, check_carrier);
-	schedule_delayed_work(&pdata->carrier_check,
CARRIER_CHECK_DELAY);
-
 	return 0;
 
 unregister_mdio:
@@ -1386,7 +1339,6 @@ static void smsc95xx_unbind(struct usbnet *dev,
struct usb_interface *intf)
 	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev-
>data[0]);

 
 	if (pdata) {
-		cancel_delayed_work_sync(&pdata->carrier_check);
 		mdiobus_unregister(pdata->mdiobus);
 		mdiobus_free(pdata->mdiobus);
 		netif_dbg(dev, ifdown, dev->net, "free pdata\n");
@@ -1651,8 +1603,6 @@ static int smsc95xx_suspend(struct usb_interface
*intf, pm_message_t message)
 		return ret;
 	}
 
-	cancel_delayed_work_sync(&pdata->carrier_check);
-
 	if (pdata->suspend_flags) {
 		netdev_warn(dev->net, "error during last resume\n");
 		pdata->suspend_flags = 0;
@@ -1896,10 +1846,6 @@ static int smsc95xx_suspend(struct usb_interface
*intf, pm_message_t message)
 	if (ret && PMSG_IS_AUTO(message))
 		usbnet_resume(intf);
 
-	if (ret)
-		schedule_delayed_work(&pdata->carrier_check,
-				      CARRIER_CHECK_DELAY);
-
 	return ret;
 }
 
@@ -1919,7 +1865,6 @@ static int smsc95xx_resume(struct usb_interface
*intf)
 
 	/* do this first to ensure it's cleared even in error case */
 	pdata->suspend_flags = 0;
-	schedule_delayed_work(&pdata->carrier_check,
CARRIER_CHECK_DELAY);
 
 	if (suspend_flags & SUSPEND_ALLMODES) {
 		/* clear wake-up sources */

Patch

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index fbb80a7aef32..3b8f7e439f44 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -51,8 +51,6 @@ 
 #define SUSPEND_ALLMODES		(SUSPEND_SUSPEND0 |
SUSPEND_SUSPEND1 | \
 					 SUSPEND_SUSPEND2 |
SUSPEND_SUSPEND3)
 
-#define CARRIER_CHECK_DELAY (2 * HZ)
-
 struct smsc95xx_priv {