Revert "net: phy: Add a phy_restore() helper"

This reverts commit 6f90170.

Author: claudiubeznea

drivers/net/phy/phy_device.c

@@ -146,10 +146,15 @@ static int mdio_bus_phy_resume(struct device *dev)
 	return 0;
 }
 
-int phy_restore(struct phy_device *phydev)
+static int mdio_bus_phy_restore(struct device *dev)
 {
+	struct phy_device *phydev = to_phy_device(dev);
+	struct net_device *netdev = phydev->attached_dev;
 	int ret;
 
+	if (!netdev)
+		return 0;
+
 	ret = phy_init_hw(phydev);
 	if (ret < 0)
 		return ret;
@@ -162,18 +167,6 @@ int phy_restore(struct phy_device *phydev)
 
 	return 0;
 }
-EXPORT_SYMBOL(phy_restore);
-
-static int mdio_bus_phy_restore(struct device *dev)
-{
-	struct phy_device *phydev = to_phy_device(dev);
-	struct net_device *netdev = phydev->attached_dev;
-
-	if (!netdev)
-		return 0;
-
-	return phy_restore(phydev);
-}
 
 static const struct dev_pm_ops mdio_bus_phy_pm_ops = {
 	.suspend = mdio_bus_phy_suspend,

include/linux/phy.h

@@ -815,7 +815,6 @@ static inline void phy_device_free(struct phy_device *phydev) { }
 #endif /* CONFIG_PHYLIB */
 void phy_device_remove(struct phy_device *phydev);
 int phy_init_hw(struct phy_device *phydev);
-int phy_restore(struct phy_device *phydev);
 int phy_suspend(struct phy_device *phydev);
 int phy_resume(struct phy_device *phydev);
 int phy_loopback(struct phy_device *phydev, bool enable);