2 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 798c7abe160..75cc165d5be 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -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;
@@ -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;
 }
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index b5e13f8d5e3..cf24cc34deb 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -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)
@@ -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;