Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951259aa authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: remove name arg from slave create 



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: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1838fa89

net/dsa/dsa2.c

+1 −2
Original line number Diff line number Diff line
@@ -257,10 +257,9 @@ static void dsa_cpu_port_unapply(struct dsa_port *port) 
static int dsa_user_port_apply(struct dsa_port *port)

{

	struct dsa_switch *ds = port->ds;

	const char *name = port->name;

	int err;



	err = dsa_slave_create(port, name);

	err = dsa_slave_create(port);

	if (err) {

		dev_warn(ds->dev, "Failed to create slave %d: %d\n",

			 port->index, err);

net/dsa/dsa_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void dsa_port_fixed_link_unregister_of(struct dsa_port *dp); 
/* slave.c */

extern const struct dsa_device_ops notag_netdev_ops;

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);

int dsa_slave_suspend(struct net_device *slave_dev);

int dsa_slave_resume(struct net_device *slave_dev);

net/dsa/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
		if (dsa_is_user_port(ds, i))

			continue;



		ret = dsa_slave_create(&ds->ports[i], cd->port_names[i]);

		ret = dsa_slave_create(&ds->ports[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);

net/dsa/slave.c

+2 −1
Original line number Diff line number Diff line
@@ -1142,11 +1142,12 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val) 
	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 net_device *master = cpu_dp->master;

	struct dsa_switch *ds = port->ds;

	const char *name = port->name;

	struct net_device *slave_dev;

	struct dsa_slave_priv *p;

	int ret;