Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486508

[PATCH 2/4] net-next: dsa: make the set_addr() operation optional

Show all headers | View raw

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>
---
 net/dsa/dsa.c  |    8 +++++---
 net/dsa/dsa2.c |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 66e31ac..a6902c1 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)
 	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 cffc19e..f8a7d9a 100644
--- 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);
-- 
1.7.10.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] net-next: dsa: set_addr should be optional John Crispin <john@phrozen.org> - 2016-09-19 15:30 +0200
  [PATCH 3/4] net-next: dsa: b53: remove empty set_addr() stub John Crispin <john@phrozen.org> - 2016-09-19 15:30 +0200
  [PATCH 2/4] net-next: dsa: make the set_addr() operation optional John Crispin <john@phrozen.org> - 2016-09-19 15:30 +0200
  [PATCH 4/4] net-next: dsa: qca8k: remove empty set_addr() stub John Crispin <john@phrozen.org> - 2016-09-19 15:30 +0200
  [PATCH 1/4] net-next: dsa: fix duplicate invocation of set_addr() John Crispin <john@phrozen.org> - 2016-09-19 15:30 +0200
    Re: [PATCH 1/4] net-next: dsa: fix duplicate invocation of set_addr() Andrew Lunn <andrew@lunn.ch> - 2016-09-19 15:50 +0200
  Re: [PATCH 0/4] net-next: dsa: set_addr should be optional Andrew Lunn <andrew@lunn.ch> - 2016-09-19 15:50 +0200
  Re: [PATCH 0/4] net-next: dsa: set_addr should be optional Florian Fainelli <f.fainelli@gmail.com> - 2016-09-19 21:50 +0200
  Re: [PATCH 0/4] net-next: dsa: set_addr should be optional David Miller <davem@davemloft.net> - 2016-09-20 10:50 +0200

csiph-web