Skip to content

Commit d899cb2

Browse files
davem330davem330
committed
Merge branch 'net-dsa-remove-useless-arguments'
Vivien Didelot says: ==================== net: dsa: remove useless arguments Several DSA core setup functions take many arguments, mostly because of the legacy code. This patch series removes the useless args of these functions, where either the dsa_switch or dsa_port argument is enough. Changes in v2: - ds->dev is already assigned by dsa_switch_alloc ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents e00e219 + 4cfbf09 commit d899cb2

File tree

5 files changed

+25
-29
lines changed

5 files changed

+25
-29
lines changed

‎net/dsa/dsa.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {
6767
[DSA_TAG_PROTO_NONE] = &none_ops,
6868
};
6969

70-
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
71-
struct dsa_port *dport, int port)
70+
int dsa_cpu_dsa_setup(struct dsa_port *port)
7271
{
73-
struct device_node *port_dn = dport->dn;
72+
struct device_node *port_dn = port->dn;
73+
struct dsa_switch *ds = port->ds;
7474
struct phy_device *phydev;
7575
int ret, mode;
7676

7777
if (of_phy_is_fixed_link(port_dn)) {
7878
ret = of_phy_register_fixed_link(port_dn);
7979
if (ret) {
80-
dev_err(dev, "failed to register fixed PHY\n");
80+
dev_err(ds->dev, "failed to register fixed PHY\n");
8181
return ret;
8282
}
8383
phydev = of_phy_find_device(port_dn);
@@ -90,7 +90,7 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
9090
genphy_config_init(phydev);
9191
genphy_read_status(phydev);
9292
if (ds->ops->adjust_link)
93-
ds->ops->adjust_link(ds, port, phydev);
93+
ds->ops->adjust_link(ds, port->index, phydev);
9494

9595
put_device(&phydev->mdio.dev);
9696
}

‎net/dsa/dsa2.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static int dsa_dsa_port_apply(struct dsa_port *port)
219219
struct dsa_switch *ds = port->ds;
220220
int err;
221221

222-
err = dsa_cpu_dsa_setup(ds, ds->dev, port, port->index);
222+
err = dsa_cpu_dsa_setup(port);
223223
if (err) {
224224
dev_warn(ds->dev, "Failed to setup dsa port %d: %d\n",
225225
port->index, err);
@@ -243,7 +243,7 @@ static int dsa_cpu_port_apply(struct dsa_port *port)
243243
struct dsa_switch *ds = port->ds;
244244
int err;
245245

246-
err = dsa_cpu_dsa_setup(ds, ds->dev, port, port->index);
246+
err = dsa_cpu_dsa_setup(port);
247247
if (err) {
248248
dev_warn(ds->dev, "Failed to setup cpu port %d: %d\n",
249249
port->index, err);
@@ -275,7 +275,7 @@ static int dsa_user_port_apply(struct dsa_port *port)
275275
if (!name)
276276
name = "eth%d";
277277

278-
err = dsa_slave_create(ds, ds->dev, port->index, name);
278+
err = dsa_slave_create(port, name);
279279
if (err) {
280280
dev_warn(ds->dev, "Failed to create slave %d: %d\n",
281281
port->index, err);

‎net/dsa/dsa_priv.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ struct dsa_slave_priv {
101101
};
102102

103103
/* dsa.c */
104-
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
105-
struct dsa_port *dport, int port);
104+
int dsa_cpu_dsa_setup(struct dsa_port *port);
106105
void dsa_cpu_dsa_destroy(struct dsa_port *dport);
107106
const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
108107
int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp);
@@ -149,8 +148,7 @@ int dsa_port_vlan_dump(struct dsa_port *dp,
149148
extern const struct dsa_device_ops notag_netdev_ops;
150149
void dsa_slave_mii_bus_init(struct dsa_switch *ds);
151150
void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops);
152-
int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
153-
int port, const char *name);
151+
int dsa_slave_create(struct dsa_port *port, const char *name);
154152
void dsa_slave_destroy(struct net_device *slave_dev);
155153
int dsa_slave_suspend(struct net_device *slave_dev);
156154
int dsa_slave_resume(struct net_device *slave_dev);

‎net/dsa/legacy.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,23 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,
7878
}
7979

8080
/* basic switch operations **************************************************/
81-
static int dsa_cpu_dsa_setups(struct dsa_switch *ds, struct device *dev)
81+
static int dsa_cpu_dsa_setups(struct dsa_switch *ds)
8282
{
83-
struct dsa_port *dport;
8483
int ret, port;
8584

8685
for (port = 0; port < ds->num_ports; port++) {
8786
if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
8887
continue;
8988

90-
dport = &ds->ports[port];
91-
ret = dsa_cpu_dsa_setup(ds, dev, dport, port);
89+
ret = dsa_cpu_dsa_setup(&ds->ports[port]);
9290
if (ret)
9391
return ret;
9492
}
9593
return 0;
9694
}
9795

98-
static int dsa_switch_setup_one(struct dsa_switch *ds, struct net_device *master,
99-
struct device *parent)
96+
static int dsa_switch_setup_one(struct dsa_switch *ds,
97+
struct net_device *master)
10098
{
10199
const struct dsa_switch_ops *ops = ds->ops;
102100
struct dsa_switch_tree *dst = ds->dst;
@@ -176,7 +174,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct net_device *master
176174
}
177175

178176
if (!ds->slave_mii_bus && ops->phy_read) {
179-
ds->slave_mii_bus = devm_mdiobus_alloc(parent);
177+
ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
180178
if (!ds->slave_mii_bus)
181179
return -ENOMEM;
182180
dsa_slave_mii_bus_init(ds);
@@ -196,14 +194,14 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct net_device *master
196194
if (!(ds->enabled_port_mask & (1 << i)))
197195
continue;
198196

199-
ret = dsa_slave_create(ds, parent, i, cd->port_names[i]);
197+
ret = dsa_slave_create(&ds->ports[i], cd->port_names[i]);
200198
if (ret < 0)
201199
netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
202200
index, i, cd->port_names[i], ret);
203201
}
204202

205203
/* Perform configuration of the CPU and DSA ports */
206-
ret = dsa_cpu_dsa_setups(ds, parent);
204+
ret = dsa_cpu_dsa_setups(ds);
207205
if (ret < 0)
208206
netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",
209207
index);
@@ -252,7 +250,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, struct net_device *master,
252250
ds->ops = ops;
253251
ds->priv = priv;
254252

255-
ret = dsa_switch_setup_one(ds, master, parent);
253+
ret = dsa_switch_setup_one(ds, master);
256254
if (ret)
257255
return ERR_PTR(ret);
258256

‎net/dsa/slave.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,9 +1195,9 @@ int dsa_slave_resume(struct net_device *slave_dev)
11951195
return 0;
11961196
}
11971197

1198-
int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
1199-
int port, const char *name)
1198+
int dsa_slave_create(struct dsa_port *port, const char *name)
12001199
{
1200+
struct dsa_switch *ds = port->ds;
12011201
struct dsa_switch_tree *dst = ds->dst;
12021202
struct net_device *master;
12031203
struct net_device *slave_dev;
@@ -1227,8 +1227,8 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
12271227
netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,
12281228
NULL);
12291229

1230-
SET_NETDEV_DEV(slave_dev, parent);
1231-
slave_dev->dev.of_node = ds->ports[port].dn;
1230+
SET_NETDEV_DEV(slave_dev, port->ds->dev);
1231+
slave_dev->dev.of_node = port->dn;
12321232
slave_dev->vlan_features = master->vlan_features;
12331233

12341234
p = netdev_priv(slave_dev);
@@ -1237,20 +1237,20 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
12371237
free_netdev(slave_dev);
12381238
return -ENOMEM;
12391239
}
1240-
p->dp = &ds->ports[port];
1240+
p->dp = port;
12411241
INIT_LIST_HEAD(&p->mall_tc_list);
12421242
p->xmit = dst->tag_ops->xmit;
12431243

12441244
p->old_pause = -1;
12451245
p->old_link = -1;
12461246
p->old_duplex = -1;
12471247

1248-
ds->ports[port].netdev = slave_dev;
1248+
port->netdev = slave_dev;
12491249
ret = register_netdev(slave_dev);
12501250
if (ret) {
12511251
netdev_err(master, "error %d registering interface %s\n",
12521252
ret, slave_dev->name);
1253-
ds->ports[port].netdev = NULL;
1253+
port->netdev = NULL;
12541254
free_percpu(p->stats64);
12551255
free_netdev(slave_dev);
12561256
return ret;

0 commit comments

Comments
 (0)