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, 6 deletions

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);