net: phy: fixed-phy: remove fixed_phy_update_state()

mvneta is the only user of fixed_phy_update_state(), which has been
converted to use phylink instead.  Remove fixed_phy_update_state().

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index eb51672106811e35ee0a7b3f0578560e16bc3670..001fe1df75572687e527c34eb608370d446bc670 100644 (file)
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -115,37 +115,6 @@ int fixed_phy_set_link_update(struct phy_device *phydev,
 }
 EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);
 
-int fixed_phy_update_state(struct phy_device *phydev,
-                          const struct fixed_phy_status *status,
-                          const struct fixed_phy_status *changed)
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct fixed_phy *fp;
-
-       if (!phydev || phydev->mdio.bus != fmb->mii_bus)
-               return -EINVAL;
-
-       list_for_each_entry(fp, &fmb->phys, node) {
-               if (fp->addr == phydev->mdio.addr) {
-                       write_seqcount_begin(&fp->seqcount);
-#define _UPD(x) if (changed->x) \
-       fp->status.x = status->x
-                       _UPD(link);
-                       _UPD(speed);
-                       _UPD(duplex);
-                       _UPD(pause);
-                       _UPD(asym_pause);
-#undef _UPD
-                       fixed_phy_update(fp);
-                       write_seqcount_end(&fp->seqcount);
-                       return 0;
-               }
-       }
-
-       return -ENOENT;
-}
-EXPORT_SYMBOL(fixed_phy_update_state);
-
 int fixed_phy_add(unsigned int irq, int phy_addr,
                  struct fixed_phy_status *status,
                  int link_gpio)

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index cf6392de6eb08e5785235ad89f5a72a3e1c59ea4..ee54453a40a0e3ba6590f8310bd3b817d632a5f5 100644 (file)
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -24,9 +24,6 @@ extern void fixed_phy_unregister(struct phy_device *phydev);
 extern int fixed_phy_set_link_update(struct phy_device *phydev,
                        int (*link_update)(struct net_device *,
                                           struct fixed_phy_status *));
-extern int fixed_phy_update_state(struct phy_device *phydev,
-                          const struct fixed_phy_status *status,
-                          const struct fixed_phy_status *changed);
 #else
 static inline int fixed_phy_add(unsigned int irq, int phy_id,
                                struct fixed_phy_status *status,
@@ -50,12 +47,6 @@ static inline int fixed_phy_set_link_update(struct phy_device *phydev,
 {
        return -ENODEV;
 }
-static inline int fixed_phy_update_state(struct phy_device *phydev,
-                          const struct fixed_phy_status *status,
-                          const struct fixed_phy_status *changed)
-{
-       return -ENODEV;
-}
 #endif /* CONFIG_FIXED_PHY */
 
 #endif /* __PHY_FIXED_H */