net: phylink: remove phylink_set_pcs()

As all users of phylink_set_pcs() have now been updated to use the
mac_select_pcs() method, it can be removed from the phylink kernel
API and its functionality moved into phylink_major_config().

Removing phylink_set_pcs() gives us a single approach for attaching
a PCS within phylink.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 28aa23533107f9e5fbc6568068e76119da077543..8d1cd2b9ba5fa9e1e6a1035b14906b06699cdfc5 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -815,8 +815,18 @@ static void phylink_major_config(struct phylink *pl, bool restart,
        /* If we have a new PCS, switch to the new PCS after preparing the MAC
         * for the change.
         */
-       if (pcs)
-               phylink_set_pcs(pl, pcs);
+       if (pcs) {
+               pl->pcs = pcs;
+               pl->pcs_ops = pcs->ops;
+
+               if (!pl->phylink_disable_state &&
+                   pl->cfg_link_an_mode == MLO_AN_INBAND) {
+                       if (pcs->poll)
+                               mod_timer(&pl->link_poll, jiffies + HZ);
+                       else
+                               del_timer(&pl->link_poll);
+               }
+       }
 
        phylink_mac_config(pl, state);
 
@@ -1286,36 +1296,6 @@ struct phylink *phylink_create(struct phylink_config *config,
 }
 EXPORT_SYMBOL_GPL(phylink_create);
 
-/**
- * phylink_set_pcs() - set the current PCS for phylink to use
- * @pl: a pointer to a &struct phylink returned from phylink_create()
- * @pcs: a pointer to the &struct phylink_pcs
- *
- * Bind the MAC PCS to phylink.  This may be called after phylink_create().
- * If it is desired to dynamically change the PCS, then the preferred method
- * is to use mac_select_pcs(), but it may also be called in mac_prepare()
- * or mac_config().
- *
- * Please note that there are behavioural changes with the mac_config()
- * callback if a PCS is present (denoting a newer setup) so removing a PCS
- * is not supported, and if a PCS is going to be used, it must be registered
- * by calling phylink_set_pcs() at the latest in the first mac_config() call.
- */
-void phylink_set_pcs(struct phylink *pl, struct phylink_pcs *pcs)
-{
-       pl->pcs = pcs;
-       pl->pcs_ops = pcs->ops;
-
-       if (!pl->phylink_disable_state &&
-           pl->cfg_link_an_mode == MLO_AN_INBAND) {
-               if (pcs->poll)
-                       mod_timer(&pl->link_poll, jiffies + HZ);
-               else
-                       del_timer(&pl->link_poll);
-       }
-}
-EXPORT_SYMBOL_GPL(phylink_set_pcs);
-
 /**
  * phylink_destroy() - cleanup and destroy the phylink instance
  * @pl: a pointer to a &struct phylink returned from phylink_create()

diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 9ef9b7047f1974dd832fdce0e10bf25c453f5d13..223781622b33a22afddef9544bedd3bbd2df1177 100644 (file)
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -532,7 +532,6 @@ void phylink_generic_validate(struct phylink_config *config,
 struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *,
                               phy_interface_t iface,
                               const struct phylink_mac_ops *mac_ops);
-void phylink_set_pcs(struct phylink *, struct phylink_pcs *pcs);
 void phylink_destroy(struct phylink *);
 
 int phylink_connect_phy(struct phylink *, struct phy_device *);