net: dsa: call phy_init_eee in DSA layer

All DSA drivers are calling phy_init_eee if eee_enabled is true.

Move up this statement in the DSA layer to simplify the DSA drivers.
qca8k does not require to cache the ethtool_eee structures from now on.

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 aef475f1ce063fea2259d70db4d16768309c25c8..9d10aac8f241872d69bff88b4267c5e49b663993 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -360,14 +360,7 @@ static int bcm_sf2_sw_set_eee(struct dsa_switch *ds, int port,
        struct ethtool_eee *p = &priv->port_sts[port].eee;
 
        p->eee_enabled = e->eee_enabled;
-
-       if (!p->eee_enabled) {
-               bcm_sf2_eee_enable_set(ds, port, false);
-       } else {
-               p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);
-               if (!p->eee_enabled)
-                       return -EOPNOTSUPP;
-       }
+       bcm_sf2_eee_enable_set(ds, port, e->eee_enabled);
 
        return 0;
 }

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index b531d4a3bab5b1b75d353005459ec4732994e47f..647d5d45c1d6cdf4603248b7b560eb9434de561c 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -855,12 +855,6 @@ static int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;
 
-       if (e->eee_enabled) {
-               err = phy_init_eee(phydev, 0);
-               if (err)
-                       return err;
-       }
-
        mutex_lock(&chip->reg_lock);
        err = mv88e6xxx_energy_detect_write(chip, port, e);
        mutex_unlock(&chip->reg_lock);

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 8cd4634c69853f09499ff0fb1964dccef3ad5e34..bfe0172ae6ccefe0d1cae27f3a78a73b105cc54d 100644 (file)
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -654,41 +654,14 @@ qca8k_eee_enable_set(struct dsa_switch *ds, int port, bool enable)
        mutex_unlock(&priv->reg_mutex);
 }
 
-static int
-qca8k_eee_init(struct dsa_switch *ds, int port,
-              struct phy_device *phy)
-{
-       int ret;
-
-       ret = phy_init_eee(phy, 0);
-       if (ret)
-               return 0;
-
-       qca8k_eee_enable_set(ds, port, true);
-
-       return 1;
-}
-
 static int
 qca8k_set_eee(struct dsa_switch *ds, int port,
              struct phy_device *phydev,
              struct ethtool_eee *e)
 {
-       struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
-       struct ethtool_eee *p = &priv->port_sts[port].eee;
-       int ret = 0;
+       qca8k_eee_enable_set(ds, port, e->eee_enabled);
 
-       p->eee_enabled = e->eee_enabled;
-
-       if (!p->eee_enabled) {
-               qca8k_eee_enable_set(ds, port, false);
-       } else {
-               p->eee_enabled = qca8k_eee_init(ds, port, phydev);
-               if (!p->eee_enabled)
-                       ret = -EOPNOTSUPP;
-       }
-
-       return ret;
+       return 0;
 }
 
 static int

diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 1ed4fac6cd6d5bc3cf05fa8cb03b513f178aa07e..1cf8a920d4ffc5ed84b8fd0948fa088b2b3ebf1b 100644 (file)
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -156,7 +156,6 @@ enum qca8k_fdb_cmd {
 };
 
 struct ar8xxx_port_status {
-       struct ethtool_eee eee;
        int enabled;
 };
 

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 7df55d597740ca12643d17d031b880b93bfda52c..ad5caaf384d79671f509437ae43f6be2954bca93 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -659,6 +659,12 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)
        if (ret)
                return ret;
 
+       if (e->eee_enabled) {
+               ret = phy_init_eee(p->phy, 0);
+               if (ret)
+                       return ret;
+       }
+
        return phy_ethtool_set_eee(p->phy, e);
 }