net: phylink: change phylink_mii_c22_pcs_set_advertisement() prototype

Change phylink_mii_c22_pcs_set_advertisement() to take only the PHY
interface and advertisement mask, rather than the full phylink state.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <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 fed0c5907c6ada92437912d4324aa8554a7a43c2..f31bfd39df4bd3cea92e859b3fb86c826d227491 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -2184,7 +2184,8 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
  * phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
  *     advertisement
  * @pcs: a pointer to a &struct mdio_device.
- * @state: a pointer to the state being configured.
+ * @interface: the PHY interface mode being configured
+ * @advertising: the ethtool advertisement mask
  *
  * Helper for MAC PCS supporting the 802.3 clause 22 register set for
  * clause 37 negotiation and/or SGMII control.
@@ -2197,22 +2198,23 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
  * zero if no change has been made, or one if the advertisement has changed.
  */
 int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs,
-                                       const struct phylink_link_state *state)
+                                         phy_interface_t interface,
+                                         const unsigned long *advertising)
 {
        struct mii_bus *bus = pcs->bus;
        int addr = pcs->addr;
        int val, ret;
        u16 adv;
 
-       switch (state->interface) {
+       switch (interface) {
        case PHY_INTERFACE_MODE_1000BASEX:
        case PHY_INTERFACE_MODE_2500BASEX:
                adv = ADVERTISE_1000XFULL;
                if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
-                                     state->advertising))
+                                     advertising))
                        adv |= ADVERTISE_1000XPAUSE;
                if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
-                                     state->advertising))
+                                     advertising))
                        adv |= ADVERTISE_1000XPSE_ASYM;
 
                val = mdiobus_read(bus, addr, MII_ADVERTISE);

diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 8fa6df3b881be9adc66e5bd837657a2fdf6d706a..6f6ecf3e0be169104b3f63237f66fc3972b78ae5 100644 (file)
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -320,7 +320,8 @@ void phylink_helper_basex_speed(struct phylink_link_state *state);
 void phylink_mii_c22_pcs_get_state(struct mdio_device *pcs,
                                   struct phylink_link_state *state);
 int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs,
-                                       const struct phylink_link_state *state);
+                                         phy_interface_t interface,
+                                         const unsigned long *advertising);
 void phylink_mii_c22_pcs_an_restart(struct mdio_device *pcs);
 
 void phylink_mii_c45_pcs_get_state(struct mdio_device *pcs,