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

Commit c33063d6 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52638f71

drivers/net/dsa/mv88e6xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -3642,6 +3642,7 @@ int mv88e6xxx_probe(struct mdio_device *mdiodev) 


	ps = (struct mv88e6xxx_priv_state *)(ds + 1);

	ds->priv = ps;

	ds->dev = dev;

	ps->dev = dev;

	ps->ds = ds;

	ps->bus = mdiodev->bus;

include/net/dsa.h

+2 −5
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ struct dsa_switch_tree { 
};



struct dsa_switch {

	struct device *dev;



	/*

	 * Parent switch tree, and switch index.

	 */
@@ -142,11 +144,6 @@ struct dsa_switch { 
	 */

	struct dsa_switch_driver	*drv;



	/*

	 * Reference to host device to use.

	 */

	struct device		*master_dev;



#ifdef CONFIG_NET_DSA_HWMON

	/*

	 * Hardware monitoring information

net/dsa/dsa.c

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

net/dsa/slave.c

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

}