net: dsa: remove PHY device argument from .set_eee

The DSA switch operations for EEE are only meant to configure a port's
MAC EEE settings. The port's PHY EEE settings are accessed by the DSA
layer and must be made available via a proper PHY driver.

In order to reduce this confusion, remove the phy_device argument from
the .set_eee operation.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 9d10aac8f241872d69bff88b4267c5e49b663993..ce886345d8d29331460d7c989fb548ad052a6b39 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -353,7 +353,6 @@ static int bcm_sf2_sw_get_eee(struct dsa_switch *ds, int port,
 }
 
 static int bcm_sf2_sw_set_eee(struct dsa_switch *ds, int port,
-                             struct phy_device *phydev,
                              struct ethtool_eee *e)
 {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 647d5d45c1d6cdf4603248b7b560eb9434de561c..aaa96487f21f699b6b6cc0507ee2d762849b4724 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -850,7 +850,7 @@ static int mv88e6xxx_get_eee(struct dsa_switch *ds, int port,
 }
 
 static int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,
-                            struct phy_device *phydev, struct ethtool_eee *e)
+                            struct ethtool_eee *e)
 {
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index bfe0172ae6ccefe0d1cae27f3a78a73b105cc54d..e209e229ed4c2997687d9fee5e552913b03823d6 100644 (file)
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -637,8 +637,8 @@ qca8k_get_sset_count(struct dsa_switch *ds)
        return ARRAY_SIZE(ar8327_mib);
 }
 
-static void
-qca8k_eee_enable_set(struct dsa_switch *ds, int port, bool enable)
+static int
+qca8k_set_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)
 {
        struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
        u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port);
@@ -646,20 +646,12 @@ qca8k_eee_enable_set(struct dsa_switch *ds, int port, bool enable)
 
        mutex_lock(&priv->reg_mutex);
        reg = qca8k_read(priv, QCA8K_REG_EEE_CTRL);
-       if (enable)
+       if (eee->eee_enabled)
                reg |= lpi_en;
        else
                reg &= ~lpi_en;
        qca8k_write(priv, QCA8K_REG_EEE_CTRL, reg);
        mutex_unlock(&priv->reg_mutex);
-}
-
-static int
-qca8k_set_eee(struct dsa_switch *ds, int port,
-             struct phy_device *phydev,
-             struct ethtool_eee *e)
-{
-       qca8k_eee_enable_set(ds, port, e->eee_enabled);
 
        return 0;
 }

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 88da272d20d04fa61d5fdba8f57c165307d32d23..ce46db323394a5eefe12e1618f035e65e3fc1546 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -335,7 +335,6 @@ struct dsa_switch_ops {
         * EEE setttings
         */
        int     (*set_eee)(struct dsa_switch *ds, int port,
-                          struct phy_device *phydev,
                           struct ethtool_eee *e);
        int     (*get_eee)(struct dsa_switch *ds, int port,
                           struct ethtool_eee *e);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index ad5caaf384d79671f509437ae43f6be2954bca93..9ddc584e70b0f630e319440e22619256531d9e74 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -655,7 +655,7 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)
        if (!ds->ops->set_eee)
                return -EOPNOTSUPP;
 
-       ret = ds->ops->set_eee(ds, p->dp->index, p->phy, e);
+       ret = ds->ops->set_eee(ds, p->dp->index, e);
        if (ret)
                return ret;