of: eliminate of_device->node and dev_archdata->{of,prom}_node

This patch eliminates the node pointer from struct of_device and the
of_node (or prom_node) pointer from struct dev_archdata since the node
pointer is now part of struct device proper when CONFIG_OF is set, and
all users of the old pointer locations have already been converted over
to use device->of_node.

Also remove dev_archdata_{get,set}_node() as it is no longer used by
anything.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

3 files changed, 1 insertions, 19 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);