17 files changed, 16 insertions, 77 deletions

diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h
index 402b46e630f6..15b0058aa7ff 100644
--- a/arch/microblaze/include/asm/device.h
+++ b/arch/microblaze/include/asm/device.h
@@ -12,9 +12,6 @@
 struct device_node;
 
 struct dev_archdata {
-        /* Optional pointer to an OF device node */
-        struct device_node      *of_node;
-
         /* DMA operations on that device */
         struct dma_map_ops      *dma_ops;
         void                    *dma_data;
@@ -23,18 +20,6 @@ struct dev_archdata {
 struct pdev_archdata {
 };
 
-static inline void dev_archdata_set_node(struct dev_archdata *ad,
-                                         struct device_node *np)
-{
-        ad->of_node = np;
-}
-
-static inline struct device_node *
-dev_archdata_get_node(const struct dev_archdata *ad)
-{
-        return ad->of_node;
-}
-
 #endif /* _ASM_MICROBLAZE_DEVICE_H */
 
 
diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h
index ba917cfaefe6..ab25a40b481c 100644
--- a/arch/microblaze/include/asm/of_device.h
+++ b/arch/microblaze/include/asm/of_device.h
@@ -21,7 +21,6 @@
  * probed using OF properties.
  */
 struct of_device {
-        struct device_node      *node; /* to be obsoleted */
         u64                     dma_mask; /* DMA mask */
         struct device           dev; /* Generic device interface */
 };
diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
index 90d2246e15c0..ac7e6e10d0ab 100644
--- a/arch/microblaze/kernel/of_device.c
+++ b/arch/microblaze/kernel/of_device.c
@@ -49,12 +49,10 @@ struct of_device *of_device_alloc(struct device_node *np,
         if (!dev)
                 return NULL;
 
-        dev->node = of_node_get(np);
+        dev->dev.of_node = of_node_get(np);
         dev->dev.dma_mask = &dev->dma_mask;
         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/include/asm/device.h b/arch/powerpc/include/asm/device.h
index 6d94d27ed850..f23f8d8bd68d 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -10,9 +10,6 @@ struct dma_map_ops;
 struct device_node;
 
 struct dev_archdata {
-        /* Optional pointer to an OF device node */
-        struct device_node      *of_node;
-
         /* DMA operations on that device */
         struct dma_map_ops      *dma_ops;
 
@@ -30,18 +27,6 @@ struct dev_archdata {
 #endif
 };
 
-static inline void dev_archdata_set_node(struct dev_archdata *ad,
-                                         struct device_node *np)
-{
-        ad->of_node = np;
-}
-
-static inline struct device_node *
-dev_archdata_get_node(const struct dev_archdata *ad)
-{
-        return ad->of_node;
-}
-
 struct pdev_archdata {
 };
 
diff --git a/arch/powerpc/include/asm/of_device.h b/arch/powerpc/include/asm/of_device.h
index a64debf177dc..8b26f96b9f9e 100644
--- a/arch/powerpc/include/asm/of_device.h
+++ b/arch/powerpc/include/asm/of_device.h
@@ -12,7 +12,6 @@
  */
 struct of_device
 {
-        struct device_node      *node;          /* to be obsoleted */
         u64                     dma_mask;       /* DMA mask */
         struct device           dev;            /* Generic device interface */
 };
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 285c8490c547..20b3474b6f6b 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -69,12 +69,10 @@ struct of_device *of_device_alloc(struct device_node *np,
         if (!dev)
                 return NULL;
 
-        dev->node = of_node_get(np);
+        dev->dev.of_node = of_node_get(np);
         dev->dev.dma_mask = &dev->dma_mask;
         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 88da282047c3..6646005dffb1 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1098,7 +1098,6 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
                         continue;
 
                 /* 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
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index d6708da114ee..4cdd0f6df8bf 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -705,7 +705,7 @@ static int vio_cmo_bus_probe(struct vio_dev *viodev)
          * Check to see that device has a DMA window and configure
          * entitlement for the device.
          */
-        if (of_get_property(viodev->dev.archdata.of_node,
+        if (of_get_property(viodev->dev.of_node,
                             "ibm,my-dma-window", NULL)) {
                 /* Check that the driver is CMO enabled and get desired DMA */
                 if (!viodrv->get_desired_dma) {
@@ -1049,7 +1049,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
         if (firmware_has_feature(FW_FEATURE_ISERIES))
                 return vio_build_iommu_table_iseries(dev);
 
-        dma_window = of_get_property(dev->dev.archdata.of_node,
+        dma_window = of_get_property(dev->dev.of_node,
                                   "ibm,my-dma-window", NULL);
         if (!dma_window)
                 return NULL;
@@ -1058,7 +1058,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
         if (tbl == NULL)
                 return NULL;
 
-        of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
+        of_parse_dma_window(dev->dev.of_node, dma_window,
                             &tbl->it_index, &offset, &size);
 
         /* TCE table size - measured in tce entries */
@@ -1086,7 +1086,7 @@ static const struct vio_device_id *vio_match_device(
 {
         while (ids->type[0] != '\0') {
                 if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
-                    of_device_is_compatible(dev->dev.archdata.of_node,
+                    of_device_is_compatible(dev->dev.of_node,
                                          ids->compat))
                         return ids;
                 ids++;
@@ -1179,7 +1179,7 @@ EXPORT_SYMBOL(vio_unregister_driver);
 static void __devinit vio_dev_release(struct device *dev)
 {
         /* XXX should free TCE table */
-        of_node_put(dev->archdata.of_node);
+        of_node_put(dev->of_node);
         kfree(to_vio_dev(dev));
 }
 
@@ -1231,7 +1231,6 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
                         viodev->unit_address = *unit_address;
         }
         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);
@@ -1316,7 +1315,7 @@ static ssize_t name_show(struct device *dev,
 static ssize_t devspec_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
-        struct device_node *of_node = dev->archdata.of_node;
+        struct device_node *of_node = dev->of_node;
 
         return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
 }
@@ -1348,7 +1347,7 @@ static int vio_hotplug(struct device *dev, struct kobj_uevent_env *env)
         struct device_node *dn;
         const char *cp;
 
-        dn = dev->archdata.of_node;
+        dn = dev->of_node;
         if (!dn)
                 return -ENODEV;
         cp = of_get_property(dn, "compatible", NULL);
@@ -1379,7 +1378,7 @@ static struct bus_type vio_bus_type = {
 */
 const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
 {
-        return of_get_property(vdev->dev.archdata.of_node, which, length);
+        return of_get_property(vdev->dev.of_node, which, length);
 }
 EXPORT_SYMBOL(vio_get_attribute);
 
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index e3ec4976fae7..22667a09d40e 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -545,7 +545,6 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
 {
         struct iommu_window *window;
         struct cbe_iommu *iommu;
-        struct dev_archdata *archdata = &dev->archdata;
 
         /* Current implementation uses the first window available in that
          * node's iommu. We -might- do something smarter later though it may
@@ -554,7 +553,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
         iommu = cell_iommu_for_node(dev_to_node(dev));
         if (iommu == NULL || list_empty(&iommu->windows)) {
                 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
-                       archdata->of_node ? archdata->of_node->full_name : "?",
+                       dev->of_node ? dev->of_node->full_name : "?",
                        dev_to_node(dev));
                 return NULL;
         }
@@ -897,7 +896,7 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
         const u32 *ranges = NULL;
         int i, len, best, naddr, nsize, pna, range_size;
 
-        np = of_node_get(dev->archdata.of_node);
+        np = of_node_get(dev->of_node);
         while (1) {
                 naddr = of_n_addr_cells(np);
                 nsize = of_n_size_cells(np);
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index ac6fdd973291..f372ec1691a3 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -360,10 +360,10 @@ static int pcmcia_notify(struct notifier_block *nb, unsigned long action,
         /* We know electra_cf devices will always have of_node set, since
          * electra_cf is an of_platform driver.
          */
-        if (!parent->archdata.of_node)
+        if (!parent->of_node)
                 return 0;
 
-        if (!of_device_is_compatible(parent->archdata.of_node, "electra-cf"))
+        if (!of_device_is_compatible(parent->of_node, "electra-cf"))
                 return 0;
 
         /* We use the direct ops for localbus */
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index e546c86a539b..23083c397528 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -767,7 +767,6 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
         };
 
         dev->core.of_node = NULL;
-        dev->core.archdata.of_node = NULL;
         set_dev_node(&dev->core, 0);
 
         pr_debug("%s:%d add %s\n", __func__, __LINE__, dev_name(&dev->core));
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 1a0000a4b6d6..d26182d42cbf 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -468,7 +468,7 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev)
 
         pr_debug("pci_dma_dev_setup_pSeries: %s\n", pci_name(dev));
 
-        dn = dev->dev.archdata.of_node;
+        dn = dev->dev.of_node;
 
         /* If we're the direct child of a root bus, then we need to allocate
          * an iommu table ourselves. The bus setup code should have setup
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h
index f3b85b6b0b76..d4c452147412 100644
--- a/arch/sparc/include/asm/device.h
+++ b/arch/sparc/include/asm/device.h
@@ -13,25 +13,10 @@ struct dev_archdata {
         void                    *iommu;
         void                    *stc;
         void                    *host_controller;
-
-        struct device_node      *prom_node;
         struct of_device        *op;
-
         int                     numa_node;
 };
 
-static inline void dev_archdata_set_node(struct dev_archdata *ad,
-                                         struct device_node *np)
-{
-        ad->prom_node = np;
-}
-
-static inline struct device_node *
-dev_archdata_get_node(const struct dev_archdata *ad)
-{
-        return ad->prom_node;
-}
-
 struct pdev_archdata {
 };
 
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h
index a5d9811f9697..f320246a0586 100644
--- a/arch/sparc/include/asm/of_device.h
+++ b/arch/sparc/include/asm/of_device.h
@@ -14,7 +14,6 @@
  */
 struct of_device
 {
-        struct device_node              *node;
         struct device                   dev;
         struct resource                 resource[PROMREG_MAX];
         unsigned int                    irqs[PROMINTR_MAX];
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 707311716142..47e63f1e719c 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -345,11 +345,9 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                 return NULL;
 
         sd = &op->dev.archdata;
-        sd->prom_node = dp;
         sd->op = op;
 
         op->dev.of_node = dp;
-        op->node = dp;
 
         op->clock_freq = of_getintprop_default(dp, "clock-frequency",
                                                (25*1000*1000));
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index c8e352e0a098..1dae8079f728 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -640,11 +640,9 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                 return NULL;
 
         sd = &op->dev.archdata;
-        sd->prom_node = dp;
         sd->op = op;
 
         op->dev.of_node = dp;
-        op->node = dp;
 
         op->clock_freq = of_getintprop_default(dp, "clock-frequency",
                                                (25*1000*1000));
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index c7a214ec5aff..8a8363adb8bd 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -261,8 +261,6 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         sd->iommu = pbm->iommu;
         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;
 
@@ -286,6 +284,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         dev->sysdata = node;
         dev->dev.parent = bus->bridge;
         dev->dev.bus = &pci_bus_type;
+        dev->dev.of_node = node;
         dev->devfn = devfn;
         dev->multifunction = 0;         /* maybe a lie? */
         set_pcie_port_type(dev);