OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Vivien Didelot 2017-08-05 16:20:19 -04:00 committed by David S. Miller
parent 47d0dcc354
commit 4cfbf09cf9
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/dsa/dsa2.c
View File

@ -275,7 +275,7 @@ static int dsa_user_port_apply(struct dsa_port *port)
if (!name) if (!name)
name = "eth%d"; name = "eth%d";
err = dsa_slave_create(ds, ds->dev, port->index, name); err = dsa_slave_create(port, name);
if (err) { if (err) {
dev_warn(ds->dev, "Failed to create slave %d: %d\n", dev_warn(ds->dev, "Failed to create slave %d: %d\n",
port->index, err); port->index, err);

3
net/dsa/dsa_priv.h
View File

@ -148,8 +148,7 @@ int dsa_port_vlan_dump(struct dsa_port *dp,
extern const struct dsa_device_ops notag_netdev_ops; extern const struct dsa_device_ops notag_netdev_ops;
void dsa_slave_mii_bus_init(struct dsa_switch *ds); void dsa_slave_mii_bus_init(struct dsa_switch *ds);
void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops); void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops);
int dsa_slave_create(struct dsa_switch *ds, struct device *parent, int dsa_slave_create(struct dsa_port *port, const char *name);
int port, const char *name);
void dsa_slave_destroy(struct net_device *slave_dev); void dsa_slave_destroy(struct net_device *slave_dev);
int dsa_slave_suspend(struct net_device *slave_dev); int dsa_slave_suspend(struct net_device *slave_dev);
int dsa_slave_resume(struct net_device *slave_dev); int dsa_slave_resume(struct net_device *slave_dev);

2
net/dsa/legacy.c
View File

@ -194,7 +194,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
if (!(ds->enabled_port_mask & (1 << i))) if (!(ds->enabled_port_mask & (1 << i)))
continue; 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) if (ret < 0)
netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n", netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
index, i, cd->port_names[i], ret); index, i, cd->port_names[i], ret);

14
net/dsa/slave.c
View File

@ -1195,9 +1195,9 @@ int dsa_slave_resume(struct net_device *slave_dev)
return 0; return 0;
} }
int dsa_slave_create(struct dsa_switch *ds, struct device *parent, int dsa_slave_create(struct dsa_port *port, const char *name)
int port, const char *name)
{ {
struct dsa_switch *ds = port->ds;
struct dsa_switch_tree *dst = ds->dst; struct dsa_switch_tree *dst = ds->dst;
struct net_device *master; struct net_device *master;
struct net_device *slave_dev; 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, netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,
NULL); NULL);
SET_NETDEV_DEV(slave_dev, parent); SET_NETDEV_DEV(slave_dev, port->ds->dev);
slave_dev->dev.of_node = ds->ports[port].dn; slave_dev->dev.of_node = port->dn;
slave_dev->vlan_features = master->vlan_features; slave_dev->vlan_features = master->vlan_features;
p = netdev_priv(slave_dev); p = netdev_priv(slave_dev);
@ -1237,7 +1237,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
free_netdev(slave_dev); free_netdev(slave_dev);
return -ENOMEM; return -ENOMEM;
} }
p->dp = &ds->ports[port]; p->dp = port;
INIT_LIST_HEAD(&p->mall_tc_list); INIT_LIST_HEAD(&p->mall_tc_list);
p->xmit = dst->tag_ops->xmit; 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_link = -1;
p->old_duplex = -1; p->old_duplex = -1;
ds->ports[port].netdev = slave_dev; port->netdev = slave_dev;
ret = register_netdev(slave_dev); ret = register_netdev(slave_dev);
if (ret) { if (ret) {
netdev_err(master, "error %d registering interface %s\n", netdev_err(master, "error %d registering interface %s\n",
ret, slave_dev->name); ret, slave_dev->name);
ds->ports[port].netdev = NULL; port->netdev = NULL;
free_percpu(p->stats64); free_percpu(p->stats64);
free_netdev(slave_dev); free_netdev(slave_dev);
return ret; return ret;