Re: [PATCH net-next 1/3] net: dsa: assign switch device in legacy code

[Vivien Didelot]

Hi Andrew,

Andrew Lunn  writes:

>> @@ -251,8 +251,9 @@ dsa_switch_setup(struct dsa_switch_tree *dst, struct 
>> net_device *master,
>>  ds->cd = cd;
>>  ds->ops = ops;
>>  ds->priv = priv;
>> +ds->dev = parent;
>
> Is this even needed? dsa_switch_alloc() does ds->dev = dev.

You are correct! Respinning.


Thanks,

Vivien

Re: [PATCH net-next 1/3] net: dsa: assign switch device in legacy code

[Andrew Lunn]

> @@ -251,8 +251,9 @@ dsa_switch_setup(struct dsa_switch_tree *dst, struct 
> net_device *master,
>   ds->cd = cd;
>   ds->ops = ops;
>   ds->priv = priv;
> + ds->dev = parent;

Hi Vivien

Is this even needed? dsa_switch_alloc() does ds->dev = dev.

   Andrew

[PATCH net-next 1/3] net: dsa: assign switch device in legacy code

[Vivien Didelot]

Assign the parent device to the dev member of the newly allocated
dsa_switch structure in the legacy dsa_switch_setup function, so that
the underlying dsa_switch_setup_one and dsa_cpu_dsa_setups functions can
access it instead of requiring an additional struct device argument.

Signed-off-by: Vivien Didelot 
---
 net/dsa/legacy.c | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index 1d7a3282f2a7..c565787e1c78 100644
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -78,7 +78,7 @@ dsa_switch_probe(struct device *parent, struct device 
*host_dev, int sw_addr,
 }
 
 /* basic switch operations **/
-static int dsa_cpu_dsa_setups(struct dsa_switch *ds, struct device *dev)
+static int dsa_cpu_dsa_setups(struct dsa_switch *ds)
 {
struct dsa_port *dport;
int ret, port;
@@ -88,15 +88,15 @@ static int dsa_cpu_dsa_setups(struct dsa_switch *ds, struct 
device *dev)
continue;
 
dport = >ports[port];
-   ret = dsa_cpu_dsa_setup(ds, dev, dport, port);
+   ret = dsa_cpu_dsa_setup(ds, ds->dev, dport, port);
if (ret)
return ret;
}
return 0;
 }
 
-static int dsa_switch_setup_one(struct dsa_switch *ds, struct net_device 
*master,
-   struct device *parent)
+static int dsa_switch_setup_one(struct dsa_switch *ds,
+   struct net_device *master)
 {
const struct dsa_switch_ops *ops = ds->ops;
struct dsa_switch_tree *dst = ds->dst;
@@ -176,7 +176,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
struct net_device *master
}
 
if (!ds->slave_mii_bus && ops->phy_read) {
-   ds->slave_mii_bus = devm_mdiobus_alloc(parent);
+   ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
if (!ds->slave_mii_bus)
return -ENOMEM;
dsa_slave_mii_bus_init(ds);
@@ -196,14 +196,14 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
struct net_device *master
if (!(ds->enabled_port_mask & (1 << i)))
continue;
 
-   ret = dsa_slave_create(ds, parent, i, cd->port_names[i]);
+   ret = dsa_slave_create(ds, ds->dev, 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);
}
 
/* Perform configuration of the CPU and DSA ports */
-   ret = dsa_cpu_dsa_setups(ds, parent);
+   ret = dsa_cpu_dsa_setups(ds);
if (ret < 0)
netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",
   index);
@@ -251,8 +251,9 @@ dsa_switch_setup(struct dsa_switch_tree *dst, struct 
net_device *master,
ds->cd = cd;
ds->ops = ops;
ds->priv = priv;
+   ds->dev = parent;
 
-   ret = dsa_switch_setup_one(ds, master, parent);
+   ret = dsa_switch_setup_one(ds, master);
if (ret)
return ERR_PTR(ret);
 
-- 
2.13.3