net-next: dsa: make the set_addr() operation optional

Only 1 of the 3 drivers currently has a set_addr() operation. Make the
set_addr() callback optional to reduce the amount of empty stubs inside
the drivers.

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 66e31acfcad8c1dbc9d34e505528aee4ce433f54..a6902c1e2f28f79c609bf511de2781908e2e1abd 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -378,9 +378,11 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
        if (ret < 0)
                goto out;
 
-       ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
-       if (ret < 0)
-               goto out;
+       if (ops->set_addr) {
+               ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
+               if (ret < 0)
+                       goto out;
+       }
 
        if (!ds->slave_mii_bus && ops->phy_read) {
                ds->slave_mii_bus = devm_mdiobus_alloc(parent);

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index cffc19e972a117d6b3389299ddcca198c5e7aac6..f8a7d9aab4372aed09dc9cd12baba0df1ce8f8ba 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -304,9 +304,11 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
        if (err < 0)
                return err;
 
-       err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
-       if (err < 0)
-               return err;
+       if (ds->ops->set_addr) {
+               err = ds->ops->set_addr(ds, dst->master_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);