The prom_node pointer is being moved out of archdata to dev->of_node. This patch changes users of prom_node to use the new location.
Signed-off-by: Grant Likely grant.likely@secretlab.ca ---
arch/sparc/include/asm/fb.h | 2 +- arch/sparc/kernel/of_device_32.c | 3 ++- arch/sparc/kernel/of_device_64.c | 3 ++- arch/sparc/kernel/pci.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/fb.h index b83e447..e834880 100644 --- a/arch/sparc/include/asm/fb.h +++ b/arch/sparc/include/asm/fb.h @@ -18,7 +18,7 @@ static inline int fb_is_primary_device(struct fb_info *info) struct device *dev = info->device; struct device_node *node;
- node = dev->archdata.prom_node; + node = dev->of_node; if (node && node == of_console_device) return 1; diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index da527b3..5a5509c 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c @@ -345,8 +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->prom_node = dp; /* temporary */ sd->op = op; + op->dev.of_node = dp;
op->node = dp;
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index b3d4cb5..9d30b07 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c @@ -640,9 +640,10 @@ static struct of_device * __init scan_one_device(struct device_node *dp, return NULL;
sd = &op->dev.archdata; - sd->prom_node = dp; + sd->prom_node = dp; /* temporary */ 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 cf73f43..40861ed 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -654,7 +654,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * struct device_node *dp;
pdev = to_pci_dev(dev); - dp = pdev->dev.archdata.prom_node; + dp = pdev->dev.of_node;
return snprintf (buf, PAGE_SIZE, "%s\n", dp->full_name); } @@ -1023,7 +1023,7 @@ void arch_teardown_msi_irq(unsigned int virt_irq)
struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) { - return pdev->dev.archdata.prom_node; + return pdev->dev.of_node; } EXPORT_SYMBOL(pci_device_to_OF_node);