diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-09 22:33:21 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 21:42:37 -0500 |
commit | 44ef339073f67d4abcc62ae52a5fbc069d7a4d29 (patch) | |
tree | f7d8dab47b9822bbd22a399f24a3e24d10f96621 /arch/powerpc/kernel/pci_32.c | |
parent | 6207e81695c1a64ebed668f26106f3384ad2323a (diff) |
[POWERPC] pci_controller->arch_data really is a struct device_node *
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 0e2bee46304c..096c97e03aa6 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -662,8 +662,8 @@ pcibios_make_OF_bus_map(void) | |||
662 | 662 | ||
663 | /* For each hose, we begin searching bridges */ | 663 | /* For each hose, we begin searching bridges */ |
664 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { | 664 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { |
665 | struct device_node* node; | 665 | struct device_node* node = hose->dn; |
666 | node = (struct device_node *)hose->arch_data; | 666 | |
667 | if (!node) | 667 | if (!node) |
668 | continue; | 668 | continue; |
669 | make_one_node_map(node, hose->first_busno); | 669 | make_one_node_map(node, hose->first_busno); |
@@ -742,7 +742,7 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus) | |||
742 | struct pci_controller *hose = pci_bus_to_host(bus); | 742 | struct pci_controller *hose = pci_bus_to_host(bus); |
743 | if (hose == NULL) | 743 | if (hose == NULL) |
744 | return NULL; | 744 | return NULL; |
745 | return of_node_get(hose->arch_data); | 745 | return of_node_get(hose->dn); |
746 | } | 746 | } |
747 | 747 | ||
748 | /* not a root bus, we need to get our parent */ | 748 | /* not a root bus, we need to get our parent */ |
@@ -812,9 +812,9 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn) | |||
812 | return -ENODEV; | 812 | return -ENODEV; |
813 | /* Make sure it's really a PCI device */ | 813 | /* Make sure it's really a PCI device */ |
814 | hose = pci_find_hose_for_OF_device(node); | 814 | hose = pci_find_hose_for_OF_device(node); |
815 | if (!hose || !hose->arch_data) | 815 | if (!hose || !hose->dn) |
816 | return -ENODEV; | 816 | return -ENODEV; |
817 | if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child, | 817 | if (!scan_OF_pci_childs(hose->dn->child, |
818 | find_OF_pci_device_filter, (void *)node)) | 818 | find_OF_pci_device_filter, (void *)node)) |
819 | return -ENODEV; | 819 | return -ENODEV; |
820 | reg = of_get_property(node, "reg", NULL); | 820 | reg = of_get_property(node, "reg", NULL); |