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

Commit 18ee49dd authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller
Browse files

phylib: rename mii_bus::dev to mii_bus::parent 



In preparation of giving mii_bus objects a device tree presence of
their own, rename struct mii_bus's ->dev argument to ->parent, since
having a 'struct device *dev' that points to our parent device
conflicts with introducing a 'struct device dev' representing our own
device.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
parent 236bb5e6

arch/powerpc/platforms/82xx/ep8248e.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev, 
		bus->irq[i] = -1;



	bus->name = "ep8248e-mdio-bitbang";

	bus->dev = &ofdev->dev;

	bus->parent = &ofdev->dev;

	snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);



	return mdiobus_register(bus);

arch/powerpc/platforms/pasemi/gpio_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev, 
	prop = of_get_property(np, "mdio-pin", NULL);

	priv->mdio_pin = *prop;



	new_bus->dev = dev;

	new_bus->parent = dev;

	dev_set_drvdata(dev, new_bus);



	err = mdiobus_register(new_bus);

drivers/net/fec_mpc52xx_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i 
	snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);

	bus->priv = priv;



	bus->dev = dev;

	bus->parent = dev;

	dev_set_drvdata(dev, bus);



	/* set MII speed */

drivers/net/fs_enet/mii-bitbang.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, 
		if (!strcmp(np->type, "ethernet-phy"))

			add_phy(new_bus, np);



	new_bus->dev = &ofdev->dev;

	new_bus->parent = &ofdev->dev;

	dev_set_drvdata(&ofdev->dev, new_bus);



	ret = mdiobus_register(new_bus);

drivers/net/fs_enet/mii-fec.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, 
		if (!strcmp(np->type, "ethernet-phy"))

			add_phy(new_bus, np);



	new_bus->dev = &ofdev->dev;

	new_bus->parent = &ofdev->dev;

	dev_set_drvdata(&ofdev->dev, new_bus);



	ret = mdiobus_register(new_bus);