aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 19:12:29 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-18 18:10:44 -0400
commit61c7a080a5a061c976988fd4b844dfb468dda255 (patch)
tree8cb492b73f2755c38a6164d770da34d5af6486a0 /arch/sparc/kernel/pci.c
parentd12d42f744f805a9ccc33cd76f04b237cd83ce56 (diff)
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. This patch makes all readers of these elements use device.of_node instead. (struct of_device *)->node (struct dev_archdata *)->prom_node (sparc) (struct dev_archdata *)->of_node (powerpc & microblaze) Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/sparc/kernel/pci.c')
-rw-r--r--arch/sparc/kernel/pci.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 0c920147b4ef..c7a214ec5aff 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 *
654 struct device_node *dp; 654 struct device_node *dp;
655 655
656 pdev = to_pci_dev(dev); 656 pdev = to_pci_dev(dev);
657 dp = pdev->dev.archdata.prom_node; 657 dp = pdev->dev.of_node;
658 658
659 return snprintf (buf, PAGE_SIZE, "%s\n", dp->full_name); 659 return snprintf (buf, PAGE_SIZE, "%s\n", dp->full_name);
660} 660}
@@ -684,7 +684,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
684struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm, 684struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
685 struct device *parent) 685 struct device *parent)
686{ 686{
687 struct device_node *node = pbm->op->node; 687 struct device_node *node = pbm->op->dev.of_node;
688 struct pci_bus *bus; 688 struct pci_bus *bus;
689 689
690 printk("PCI: Scanning PBM %s\n", node->full_name); 690 printk("PCI: Scanning PBM %s\n", node->full_name);
@@ -1023,7 +1023,7 @@ void arch_teardown_msi_irq(unsigned int virt_irq)
1023 1023
1024struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) 1024struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
1025{ 1025{
1026 return pdev->dev.archdata.prom_node; 1026 return pdev->dev.of_node;
1027} 1027}
1028EXPORT_SYMBOL(pci_device_to_OF_node); 1028EXPORT_SYMBOL(pci_device_to_OF_node);
1029 1029
@@ -1152,15 +1152,13 @@ static int __init of_pci_slot_init(void)
1152 struct device_node *node; 1152 struct device_node *node;
1153 1153
1154 if (pbus->self) { 1154 if (pbus->self) {
1155 struct dev_archdata *sd = pbus->self->sysdata;
1156
1157 /* PCI->PCI bridge */ 1155 /* PCI->PCI bridge */
1158 node = sd->prom_node; 1156 node = pbus->self->dev.of_node;
1159 } else { 1157 } else {
1160 struct pci_pbm_info *pbm = pbus->sysdata; 1158 struct pci_pbm_info *pbm = pbus->sysdata;
1161 1159
1162 /* Host PCI controller */ 1160 /* Host PCI controller */
1163 node = pbm->op->node; 1161 node = pbm->op->dev.of_node;
1164 } 1162 }
1165 1163
1166 pci_bus_slot_names(node, pbus); 1164 pci_bus_slot_names(node, pbus);