Skip to content

Commit

Permalink
phylib: two dynamic mii_bus allocation fallout fixes
Browse files Browse the repository at this point in the history
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: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Lennert Buytenhek authored and David S. Miller committed Oct 9, 2008
1 parent 724f880 commit ec2a565
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/pasemi/gpio_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
if (!priv)
goto out;

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

if (!new_bus)
goto out_free_priv;
Expand Down Expand Up @@ -306,7 +306,7 @@ static int gpio_mdio_remove(struct of_device *dev)

kfree(bus->priv);
bus->priv = NULL;
kfree(bus);
mdiobus_free(bus);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/phy/fixed.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct fixed_mdio_bus *fmb = container_of(bus, struct fixed_mdio_bus,
mii_bus);
struct fixed_mdio_bus *fmb = bus->priv;
struct fixed_phy *fp;

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

snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "0");
fmb->mii_bus->name = "Fixed MDIO Bus";
fmb->mii_bus->priv = fmb;
fmb->mii_bus->parent = &pdev->dev;
fmb->mii_bus->read = &fixed_mdio_read;
fmb->mii_bus->write = &fixed_mdio_write;
Expand Down

0 comments on commit ec2a565

Please sign in to comment.