net: phylink: rename phylink_sfp_config()

phylink_sfp_config() now only deals with configuring the MAC for a
SFP containing a PHY. Rename it to be specific.

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

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index ab32ef767d69fff7bde700851b3ff3c93b97ccab..f6e9231f0cbe2e9ca1d800ae8cb6aca765ef4ccf 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -2867,9 +2867,8 @@ static void phylink_sfp_set_config(struct phylink *pl, u8 mode,
                phylink_mac_initial_config(pl, false);
 }
 
-static int phylink_sfp_config(struct phylink *pl, u8 mode,
-                             const unsigned long *supported,
-                             const unsigned long *advertising)
+static int phylink_sfp_config_phy(struct phylink *pl, u8 mode,
+                                 struct phy_device *phy)
 {
        __ETHTOOL_DECLARE_LINK_MODE_MASK(support1);
        __ETHTOOL_DECLARE_LINK_MODE_MASK(support);
@@ -2877,10 +2876,10 @@ static int phylink_sfp_config(struct phylink *pl, u8 mode,
        phy_interface_t iface;
        int ret;
 
-       linkmode_copy(support, supported);
+       linkmode_copy(support, phy->supported);
 
        memset(&config, 0, sizeof(config));
-       linkmode_copy(config.advertising, advertising);
+       linkmode_copy(config.advertising, phy->advertising);
        config.interface = PHY_INTERFACE_MODE_NA;
        config.speed = SPEED_UNKNOWN;
        config.duplex = DUPLEX_UNKNOWN;
@@ -3093,7 +3092,7 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
                mode = MLO_AN_INBAND;
 
        /* Do the initial configuration */
-       ret = phylink_sfp_config(pl, mode, phy->supported, phy->advertising);
+       ret = phylink_sfp_config_phy(pl, mode, phy);
        if (ret < 0)
                return ret;