Merge git://git.infradead.org/~dwmw2/mtd-2.6.35

[pandora-kernel.git] / drivers / of / of_mdio.c

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index b474833..42a6715 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -79,7 +79,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                /* Associate the OF node with the device structure so it
                 * can be looked up later */
                of_node_get(child);
-               dev_archdata_set_node(&phy->dev.archdata, child);
+               phy->dev.of_node = child;
 
                /* All data is now stored in the phy struct; register it */
                rc = phy_device_register(phy);
@@ -100,7 +100,7 @@ EXPORT_SYMBOL(of_mdiobus_register);
 /* Helper function for of_phy_find_device */
 static int of_phy_match(struct device *dev, void *phy_np)
 {
-       return dev_archdata_get_node(&dev->archdata) == phy_np;
+       return dev->of_node == phy_np;
 }
 
 /**
@@ -166,7 +166,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
        if (!dev->dev.parent)
                return NULL;
 
-       net_np = dev_archdata_get_node(&dev->dev.parent->archdata);
+       net_np = dev->dev.parent->of_node;
        if (!net_np)
                return NULL;