Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: dsa: remove name arg from slave create

Browse source 
Now that slave dsa_port always have their name set, there is no need to
pass it to dsa_slave_create() anymore. Remove this argument.

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-10-27 15:55:19 -04:00 committed by David S. Miller
parent 1838fa89a2
commit 951259aa60
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/dsa/dsa2.c
View file

@ -257,10 +257,9 @@ static void dsa_cpu_port_unapply(struct dsa_port *port)
static int dsa_user_port_apply(struct dsa_port *port) static int dsa_user_port_apply(struct dsa_port *port)
{ {
struct dsa_switch *ds = port->ds; struct dsa_switch *ds = port->ds;
const char *name = port->name;
int err; int err;
err = dsa_slave_create(port, name); err = dsa_slave_create(port);
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);

2
net/dsa/dsa_priv.h
View file

@ -163,7 +163,7 @@ void dsa_port_fixed_link_unregister_of(struct dsa_port *dp);
/* slave.c */ /* slave.c */
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);
int dsa_slave_create(struct dsa_port *port, const char *name); int dsa_slave_create(struct dsa_port *dp);
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

@ -197,7 +197,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
if (dsa_is_user_port(ds, i)) if (dsa_is_user_port(ds, i))
continue; continue;
ret = dsa_slave_create(&ds->ports[i], cd->port_names[i]); ret = dsa_slave_create(&ds->ports[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);

3
net/dsa/slave.c
View file

@ -1142,11 +1142,12 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val)
call_dsa_notifiers(val, dev, &rinfo.info); call_dsa_notifiers(val, dev, &rinfo.info);
} }
int dsa_slave_create(struct dsa_port *port, const char *name) int dsa_slave_create(struct dsa_port *port)
{ {
struct dsa_port *cpu_dp = port->cpu_dp; struct dsa_port *cpu_dp = port->cpu_dp;
struct net_device *master = cpu_dp->master; struct net_device *master = cpu_dp->master;
struct dsa_switch *ds = port->ds; struct dsa_switch *ds = port->ds;
const char *name = port->name;
struct net_device *slave_dev; struct net_device *slave_dev;
struct dsa_slave_priv *p; struct dsa_slave_priv *p;
int ret; int ret;