diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2016-05-10 23:27:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-11 19:36:28 -0400 |
| commit | c33063d6a0d83a553faacf32f3cb834e63d8ecd7 (patch) | |
| tree | 789e0ef5e0cea80f757419483c3275a0990e048a /net/dsa | |
| parent | 52638f71fcff9386fe64c83a18a129b122333fdf (diff) | |
| download | lwn-c33063d6a0d83a553faacf32f3cb834e63d8ecd7.tar.gz lwn-c33063d6a0d83a553faacf32f3cb834e63d8ecd7.zip | |
dsa: Remove master_dev from switch structure
The switch drivers only use the master_dev member for dev_info()
messages. Now that the device is passed to the old style probe, and
new style drivers are probed as true linux drivers, this is no longer
needed.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 2 | ||||
| -rw-r--r-- | net/dsa/slave.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index df169811f26d..5db779c69a68 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -411,7 +411,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, ds->pd = pd; ds->drv = drv; ds->priv = priv; - ds->master_dev = host_dev; + ds->dev = parent; ret = dsa_switch_setup_one(ds, parent); if (ret) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 5ea8a40c8d33..f25dcd9e814a 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -51,7 +51,7 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) ds->slave_mii_bus->write = dsa_slave_phy_write; snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d:%.2x", ds->index, ds->pd->sw_addr); - ds->slave_mii_bus->parent = ds->master_dev; + ds->slave_mii_bus->parent = ds->dev; ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask; } |