From: Grant Likely <redacted>

This patch makes changes in preparation for supporting open firmware
device tree descriptions of MDIO busses.  Changes include:
- Cleanup handling of phy_map[] entries; they are already NULLed when
 registering and so don't need to be re-cleared, and it is good practice
 to clear them out when unregistering.
- Split phy_device registration out into a new function so that the
 OF helpers can do two stage registration (separate allocation and
 registration steps).

Signed-off-by: Grant Likely <redacted>
CC: linuxppc-dev@ozlabs.org
CC: netdev@vger.kernel.org
CC: Andy Fleming <redacted>
---

 drivers/net/phy/mdio_bus.c   |   29 +++------------------------
 drivers/net/phy/phy_device.c |   45 ++++++++++++++++++++++++++++++++++++++----
 include/linux/phy.h          |    1 +
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 811a637..3c39c7b 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c

@@ -112,7 +112,6 @@ int mdiobus_register(struct mii_bus *bus)

               bus->reset(bus);

       for (i = 0; i < PHY_MAX_ADDR; i++) {
-               bus->phy_map[i] = NULL;
               if ((bus->phy_mask & (1 << i)) == 0) {
                       struct phy_device *phydev;

@@ -149,6 +148,7 @@ void mdiobus_unregister(struct mii_bus *bus)

       for (i = 0; i < PHY_MAX_ADDR; i++) {
               if (bus->phy_map[i])
                       device_unregister(&bus->phy_map[i]->dev);
+               bus->phy_map[i] = NULL;
       }
 }
 EXPORT_SYMBOL(mdiobus_unregister);

@@ -187,35 +187,12 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)

       if (IS_ERR(phydev) || phydev == NULL)
               return phydev;

-       /* There's a PHY at this address
-        * We need to set:
-        * 1) IRQ
-        * 2) bus_id
-        * 3) parent
-        * 4) bus
-        * 5) mii_bus
-        * And, we need to register it */
-
-       phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;
-
-       phydev->dev.parent = bus->parent;
-       phydev->dev.bus = &mdio_bus_type;
-       dev_set_name(&phydev->dev, PHY_ID_FMT, bus->id, addr);
-
-       phydev->bus = bus;
-
-       /* Run all of the fixups for this PHY */
-       phy_scan_fixups(phydev);
-
-       err = device_register(&phydev->dev);
+       err = phy_device_register(phydev);
       if (err) {
-               printk(KERN_ERR "phy %d failed to register\n", addr);
               phy_device_free(phydev);
-               phydev = NULL;
+               return NULL;
       }

-       bus->phy_map[addr] = phydev;
-
       return phydev;
 }
 EXPORT_SYMBOL(mdiobus_scan);

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 0a06e4f..9352ca8 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c

@@ -39,20 +39,21 @@ MODULE_DESCRIPTION("PHY library");

 MODULE_AUTHOR("Andy Fleming");
 MODULE_LICENSE("GPL");

-static struct phy_driver genphy_driver;
-extern int mdio_bus_init(void);
-extern void mdio_bus_exit(void);
-
 void phy_device_free(struct phy_device *phydev)
 {
       kfree(phydev);
 }
+EXPORT_SYMBOL(phy_device_free);

 static void phy_device_release(struct device *dev)
 {
       phy_device_free(to_phy_device(dev));
 }

+static struct phy_driver genphy_driver;
+extern int mdio_bus_init(void);
+extern void mdio_bus_exit(void);
+
 static LIST_HEAD(phy_fixup_list);
 static DEFINE_MUTEX(phy_fixup_lock);

@@ -166,6 +167,10 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)

       dev->addr = addr;
       dev->phy_id = phy_id;
       dev->bus = bus;
+       dev->dev.parent = bus->parent;
+       dev->dev.bus = &mdio_bus_type;
+       dev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;
+       dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);

       dev->state = PHY_DOWN;

@@ -235,6 +240,38 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr)

       return dev;
 }
+EXPORT_SYMBOL(get_phy_device);
+
+/**
+ * phy_device_register - Register the phy device on the MDIO bus
+ * @phy_device: phy_device structure to be added to the MDIO bus
+ */
+int phy_device_register(struct phy_device *phydev)
+{
+       int err;
+
+       /* Don't register a phy if one is already registered at this
+        * address */
+       if (phydev->bus->phy_map[phydev->addr])
+               return -EINVAL;
+       phydev->bus->phy_map[phydev->addr] = phydev;
+
+       /* Run all of the fixups for this PHY */
+       phy_scan_fixups(phydev);
+
+       err = device_register(&phydev->dev);
+       if (err) {
+               pr_err("phy %d failed to register\n", phydev->addr);
+               goto out;
+       }
+
+       return 0;
+
+ out:
+       phydev->bus->phy_map[phydev->addr] = NULL;
+       return err;
+}
+EXPORT_SYMBOL(phy_device_register);

 /**
 * phy_prepare_link - prepares the PHY layer to monitor link status

diff --git a/include/linux/phy.h b/include/linux/phy.h
index d7e54d9..a47d64f 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h

@@ -439,6 +439,7 @@ static inline int phy_write(struct phy_device *phydev, u16 regnum, u16 val)

 int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
 struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
+int phy_device_register(struct phy_device *phy);
 int phy_clear_interrupt(struct phy_device *phydev);
 int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);
 struct phy_device * phy_attach(struct net_device *dev,