driver-core: Add device node pointer to struct device

Currently, platforms using CONFIG_OF add a 'struct device_node *of_node'
to dev->archdata.  However, with CONFIG_OF becoming generic for all
architectures, it makes sense for commonality to move it out of archdata
and into struct device proper.

This patch adds a struct device_node *of_node member to struct device
and updates all locations which currently write the device_node pointer
into archdata to also update dev->of_node.  Subsequent patches will
modify callers to use the archdata location and ultimately remove
the archdata member entirely.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
CC: Michal Simek <monstr@monstr.eu>
CC: Greg Kroah-Hartman <gregkh@suse.de>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: "David S. Miller" <davem@davemloft.net>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Jeremy Kerr <jeremy.kerr@canonical.com>
CC: microblaze-uclinux@itee.uq.edu.au
CC: linux-kernel@vger.kernel.org
CC: linuxppc-dev@ozlabs.org
CC: sparclinux@vger.kernel.org

11 files changed, 16 insertions, 2 deletions

diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
index 9a0f7632c47c..f6c521898ebf 100644
--- a/arch/microblaze/kernel/of_device.c
+++ b/arch/microblaze/kernel/of_device.c
@@ -54,6 +54,7 @@ struct of_device *of_device_alloc(struct device_node *np,
         dev->dev.parent = parent;
         dev->dev.release = of_release_dev;
         dev->dev.archdata.of_node = np;
+        dev->dev.of_node = np;
 
         if (bus_id)
                 dev_set_name(&dev->dev, bus_id);
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index a359cb08e900..9577e6f4e3bf 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -74,6 +74,7 @@ struct of_device *of_device_alloc(struct device_node *np,
         dev->dev.parent = parent;
         dev->dev.release = of_release_dev;
         dev->dev.archdata.of_node = np;
+        dev->dev.of_node = np;
 
         if (bus_id)
                 dev_set_name(&dev->dev, "%s", bus_id);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 0c0567e58409..88da282047c3 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1097,8 +1097,9 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
                 if (dev->is_added)
                         continue;
 
-                /* Setup OF node pointer in archdata */
+                /* Setup OF node pointer in the device */
                 sd->of_node = pci_device_to_OF_node(dev);
+                dev->dev.of_node = pci_device_to_OF_node(dev);
 
                 /* Fixup NUMA node as it may not be setup yet by the generic
                  * code and is needed by the DMA init
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 82237176a2a3..d6708da114ee 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1230,7 +1230,8 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
                 if (unit_address != NULL)
                         viodev->unit_address = *unit_address;
         }
-        viodev->dev.archdata.of_node = of_node_get(of_node);
+        viodev->dev.of_node = of_node_get(of_node);
+        viodev->dev.archdata.of_node = viodev->dev.of_node;
 
         if (firmware_has_feature(FW_FEATURE_CMO))
                 vio_cmo_set_dma_ops(viodev);
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 6d09f5e3e7e4..e546c86a539b 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -766,6 +766,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
                 BUG();
         };
 
+        dev->core.of_node = NULL;
         dev->core.archdata.of_node = NULL;
         set_dev_node(&dev->core, 0);
 
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index da527b33ebc7..4926c1babd84 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -348,6 +348,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
         sd->prom_node = dp;
         sd->op = op;
 
+        op->dev.of_node = dp;
         op->node = dp;
 
         op->clock_freq = of_getintprop_default(dp, "clock-frequency",
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index b3d4cb5d21b3..5bc74161667c 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -643,6 +643,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
         sd->prom_node = dp;
         sd->op = op;
 
+        op->dev.of_node = dp;
         op->node = dp;
 
         op->clock_freq = of_getintprop_default(dp, "clock-frequency",
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 5ac539a5930f..0c920147b4ef 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -262,6 +262,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         sd->stc = &pbm->stc;
         sd->host_controller = pbm;
         sd->prom_node = node;
+        dev->dev.of_node = node;
         sd->op = op = of_find_device_by_node(node);
         sd->numa_node = pbm->numa_node;
 
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 18ecae4a4375..12090f57dc87 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -80,6 +80,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                  * 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);
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
index f65f48b98448..f3119a0836af 100644
--- a/drivers/of/of_spi.c
+++ b/drivers/of/of_spi.c
@@ -79,6 +79,7 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np)
 
                 /* Store a pointer to the node in the device structure */
                 of_node_get(nc);
+                spi->dev.of_node = nc;
                 spi->dev.archdata.of_node = nc;
 
                 /* Register the new device */
diff --git a/include/linux/device.h b/include/linux/device.h
index 182192892d45..7a968bdb02e2 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -34,6 +34,7 @@ struct class;
 struct class_private;
 struct bus_type;
 struct bus_type_private;
+struct device_node;
 
 struct bus_attribute {
         struct attribute        attr;
@@ -433,6 +434,9 @@ struct device {
                                              override */
         /* arch specific additions */
         struct dev_archdata     archdata;
+#ifdef CONFIG_OF
+        struct device_node      *of_node;
+#endif
 
         dev_t                   devt;   /* dev_t, creates the sysfs "dev" */