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

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

phylib: two dynamic mii_bus allocation fallout fixes 



1. arch/powerpc/platforms/pasemi/gpio_mdio.c also needs to be
   converted over to mdiobus_{alloc,free}().

2. drivers/net/phy/fixed.c used to embed a struct mii_bus into its
   struct fixed_mdio_bus and then use container_of() to go from the
   former to the latter.  Since mii bus structures are no longer
   embedded, we need to do something like use the mii bus private
   pointer to go from mii_bus to fixed_mdio_bus instead.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 724f8805

arch/powerpc/platforms/pasemi/gpio_mdio.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev, 
	if (!priv)

	if (!priv)

		goto out;

		goto out;





	new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);

	new_bus = mdiobus_alloc();





	if (!new_bus)

	if (!new_bus)

		goto out_free_priv;

		goto out_free_priv;
@@ -306,7 +306,7 @@ static int gpio_mdio_remove(struct of_device *dev) 




	kfree(bus->priv);

	kfree(bus->priv);

	bus->priv = NULL;

	bus->priv = NULL;

	kfree(bus);

	mdiobus_free(bus);





	return 0;

	return 0;

}

}

drivers/net/phy/fixed.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -115,8 +115,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp) 




static int fixed_mdio_read(struct mii_bus *bus, int phy_id, int reg_num)

static int fixed_mdio_read(struct mii_bus *bus, int phy_id, int reg_num)

{

{

	struct fixed_mdio_bus *fmb = container_of(bus, struct fixed_mdio_bus,

	struct fixed_mdio_bus *fmb = bus->priv;

						  mii_bus);

	struct fixed_phy *fp;

	struct fixed_phy *fp;





	if (reg_num >= MII_REGS_NUM)

	if (reg_num >= MII_REGS_NUM)
@@ -221,6 +220,7 @@ static int __init fixed_mdio_bus_init(void) 




	snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "0");

	snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "0");

	fmb->mii_bus->name = "Fixed MDIO Bus";

	fmb->mii_bus->name = "Fixed MDIO Bus";

	fmb->mii_bus->priv = fmb;

	fmb->mii_bus->parent = &pdev->dev;

	fmb->mii_bus->parent = &pdev->dev;

	fmb->mii_bus->read = &fixed_mdio_read;

	fmb->mii_bus->read = &fixed_mdio_read;

	fmb->mii_bus->write = &fixed_mdio_write;

	fmb->mii_bus->write = &fixed_mdio_write;