diff options
author | John Crispin <john@phrozen.org> | 2016-09-19 09:28:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-20 04:47:44 -0400 |
commit | 092183df0fa1f4b49baad3a980c55d55de07dfb7 (patch) | |
tree | 5e3c4a89f506bf3c488204ccf519e772c9944cde /net/dsa/dsa.c | |
parent | 06f8ec9041f02d44bb0b75d47668e2fe00d5e0c3 (diff) |
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>
Diffstat (limited to 'net/dsa/dsa.c')
-rw-r--r-- | net/dsa/dsa.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 66e31acfcad8..a6902c1e2f28 100644 --- 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) | |||
378 | if (ret < 0) | 378 | if (ret < 0) |
379 | goto out; | 379 | goto out; |
380 | 380 | ||
381 | ret = ops->set_addr(ds, dst->master_netdev->dev_addr); | 381 | if (ops->set_addr) { |
382 | if (ret < 0) | 382 | ret = ops->set_addr(ds, dst->master_netdev->dev_addr); |
383 | goto out; | 383 | if (ret < 0) |
384 | goto out; | ||
385 | } | ||
384 | 386 | ||
385 | if (!ds->slave_mii_bus && ops->phy_read) { | 387 | if (!ds->slave_mii_bus && ops->phy_read) { |
386 | ds->slave_mii_bus = devm_mdiobus_alloc(parent); | 388 | ds->slave_mii_bus = devm_mdiobus_alloc(parent); |