net: dsa: remove useless args of dsa_slave_create

dsa_slave_create currently takes 4 arguments while it only needs the
related dsa_port and its name. Remove all other arguments.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 2a0120493cf1b277c861c184219fe5ae3524b71c..cceaa4dd9f53c30c5a3d9d647379a24358fca669 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -275,7 +275,7 @@ static int dsa_user_port_apply(struct dsa_port *port)
        if (!name)
                name = "eth%d";
 
-       err = dsa_slave_create(ds, ds->dev, port->index, name);
+       err = dsa_slave_create(port, name);
        if (err) {
                dev_warn(ds->dev, "Failed to create slave %d: %d\n",
                         port->index, err);

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 2873d912b12ecb9d63fd5d1127f13895bd1f2743..945ded148c9cb6703322957bea03c9b015596de0 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -148,8 +148,7 @@ int dsa_port_vlan_dump(struct dsa_port *dp,
 extern const struct dsa_device_ops notag_netdev_ops;
 void dsa_slave_mii_bus_init(struct dsa_switch *ds);
 void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops);
-int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
-                    int port, const char *name);
+int dsa_slave_create(struct dsa_port *port, const char *name);
 void dsa_slave_destroy(struct net_device *slave_dev);
 int dsa_slave_suspend(struct net_device *slave_dev);
 int dsa_slave_resume(struct net_device *slave_dev);

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index 903e8d70c7926de0884152196be69b533d119e16..612acf16d573d39c04a93a6ea70b1582a00f44f2 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -194,7 +194,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
                if (!(ds->enabled_port_mask & (1 << i)))
                        continue;
 
-               ret = dsa_slave_create(ds, ds->dev, i, cd->port_names[i]);
+               ret = dsa_slave_create(&ds->ports[i], cd->port_names[i]);
                if (ret < 0)
                        netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
                                   index, i, cd->port_names[i], ret);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index c6b5de2fe413a7dd35e2199068c69d54475f0cae..3b36c47472c69972855868d850280e44f35fc789 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1195,9 +1195,9 @@ int dsa_slave_resume(struct net_device *slave_dev)
        return 0;
 }
 
-int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
-                    int port, const char *name)
+int dsa_slave_create(struct dsa_port *port, const char *name)
 {
+       struct dsa_switch *ds = port->ds;
        struct dsa_switch_tree *dst = ds->dst;
        struct net_device *master;
        struct net_device *slave_dev;
@@ -1227,8 +1227,8 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
        netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,
                                 NULL);
 
-       SET_NETDEV_DEV(slave_dev, parent);
-       slave_dev->dev.of_node = ds->ports[port].dn;
+       SET_NETDEV_DEV(slave_dev, port->ds->dev);
+       slave_dev->dev.of_node = port->dn;
        slave_dev->vlan_features = master->vlan_features;
 
        p = netdev_priv(slave_dev);
@@ -1237,7 +1237,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
                free_netdev(slave_dev);
                return -ENOMEM;
        }
-       p->dp = &ds->ports[port];
+       p->dp = port;
        INIT_LIST_HEAD(&p->mall_tc_list);
        p->xmit = dst->tag_ops->xmit;
 
@@ -1245,12 +1245,12 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
        p->old_link = -1;
        p->old_duplex = -1;
 
-       ds->ports[port].netdev = slave_dev;
+       port->netdev = slave_dev;
        ret = register_netdev(slave_dev);
        if (ret) {
                netdev_err(master, "error %d registering interface %s\n",
                           ret, slave_dev->name);
-               ds->ports[port].netdev = NULL;
+               port->netdev = NULL;
                free_percpu(p->stats64);
                free_netdev(slave_dev);
                return ret;