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/platforms/powermac | |
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/platforms/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index ec49099830d5..778c249d8815 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
@@ -319,7 +319,7 @@ static int u3_ht_skip_device(struct pci_controller *hose, | |||
319 | if (bus->self) | 319 | if (bus->self) |
320 | busdn = pci_device_to_OF_node(bus->self); | 320 | busdn = pci_device_to_OF_node(bus->self); |
321 | else | 321 | else |
322 | busdn = hose->arch_data; | 322 | busdn = hose->dn; |
323 | for (dn = busdn->child; dn; dn = dn->sibling) | 323 | for (dn = busdn->child; dn; dn = dn->sibling) |
324 | if (PCI_DN(dn) && PCI_DN(dn)->devfn == devfn) | 324 | if (PCI_DN(dn) && PCI_DN(dn)->devfn == devfn) |
325 | break; | 325 | break; |
@@ -778,7 +778,7 @@ static void __init setup_u4_pcie(struct pci_controller* hose) | |||
778 | 778 | ||
779 | static void __init setup_u3_ht(struct pci_controller* hose) | 779 | static void __init setup_u3_ht(struct pci_controller* hose) |
780 | { | 780 | { |
781 | struct device_node *np = (struct device_node *)hose->arch_data; | 781 | struct device_node *np = hose->dn; |
782 | struct pci_controller *other = NULL; | 782 | struct pci_controller *other = NULL; |
783 | int i, cur; | 783 | int i, cur; |
784 | 784 | ||
@@ -1032,7 +1032,7 @@ void __init pmac_pci_init(void) | |||
1032 | * future though | 1032 | * future though |
1033 | */ | 1033 | */ |
1034 | if (u3_agp) { | 1034 | if (u3_agp) { |
1035 | struct device_node *np = u3_agp->arch_data; | 1035 | struct device_node *np = u3_agp->dn; |
1036 | PCI_DN(np)->busno = 0xf0; | 1036 | PCI_DN(np)->busno = 0xf0; |
1037 | for (np = np->child; np; np = np->sibling) | 1037 | for (np = np->child; np; np = np->sibling) |
1038 | PCI_DN(np)->busno = 0xf0; | 1038 | PCI_DN(np)->busno = 0xf0; |