net: dsa: remove .set_addr

Now that there is no user for the .set_addr function, remove it from
DSA. If a switch supports this feature (like mv88e6xxx), the
implementation can be done in the driver setup.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index ce1d622734d73ce9dec71ce8b1baad3be214422e..2746741f74cf4c6eadda15acb7f0bfedb8594960 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -291,7 +291,6 @@ struct dsa_switch_ops {
        enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds);
 
        int     (*setup)(struct dsa_switch *ds);
-       int     (*set_addr)(struct dsa_switch *ds, u8 *addr);
        u32     (*get_phy_flags)(struct dsa_switch *ds, int port);
 
        /*

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 54ed054777bd7c8f9a8dc7ef26ba9a9524eb6bed..6ac9e11d385c5078735b55d9b1036569bdfcb3e0 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -336,12 +336,6 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
        if (err)
                return err;
 
-       if (ds->ops->set_addr) {
-               err = ds->ops->set_addr(ds, dst->cpu_dp->netdev->dev_addr);
-               if (err < 0)
-                       return err;
-       }
-
        if (!ds->slave_mii_bus && ds->ops->phy_read) {
                ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
                if (!ds->slave_mii_bus)

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index 19ff6e0a21dc526d345e68a2b4bf1c593c0ff6f8..b0fefbffe082a9566952ec88ffc3bd9a3d843775 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -172,12 +172,6 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
        if (ret)
                return ret;
 
-       if (ops->set_addr) {
-               ret = ops->set_addr(ds, master->dev_addr);
-               if (ret < 0)
-                       return ret;
-       }
-
        if (!ds->slave_mii_bus && ops->phy_read) {
                ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
                if (!ds->slave_mii_bus)