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

Commit 4cfbf09c authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

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: 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 47d0dcc3

net/dsa/dsa2.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/dsa/dsa_priv.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/dsa/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/dsa/slave.c

+7 −7
Original line number Diff line number Diff line
@@ -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;