aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/celleb
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/platforms/celleb')
-rw-r--r--arch/powerpc/platforms/celleb/io-workarounds.c4
-rw-r--r--arch/powerpc/platforms/celleb/pci.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/celleb/io-workarounds.c b/arch/powerpc/platforms/celleb/io-workarounds.c
index 32b9cecfda1..b939c0e98af 100644
--- a/arch/powerpc/platforms/celleb/io-workarounds.c
+++ b/arch/powerpc/platforms/celleb/io-workarounds.c
@@ -222,7 +222,7 @@ void __init celleb_pci_add_one(struct pci_controller *phb,
222 void (*dummy_read)(struct pci_controller *)) 222 void (*dummy_read)(struct pci_controller *))
223{ 223{
224 struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count]; 224 struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count];
225 struct device_node *np = phb->arch_data; 225 struct device_node *np = phb->dn;
226 226
227 if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) { 227 if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) {
228 printk(KERN_ERR "Too many pci bridges, workarounds" 228 printk(KERN_ERR "Too many pci bridges, workarounds"
@@ -262,7 +262,7 @@ int __init celleb_pci_workaround_init(void)
262 } 262 }
263 263
264 list_for_each_entry(phb, &hose_list, list_node) { 264 list_for_each_entry(phb, &hose_list, list_node) {
265 node = phb->arch_data; 265 node = phb->dn;
266 match = of_match_node(celleb_pci_workaround_match, node); 266 match = of_match_node(celleb_pci_workaround_match, node);
267 267
268 if (match) { 268 if (match) {
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
index 13ec4a606b9..5d399e038c2 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/celleb/pci.c
@@ -480,7 +480,7 @@ static struct of_device_id celleb_phb_match[] __initdata = {
480 480
481int __init celleb_setup_phb(struct pci_controller *phb) 481int __init celleb_setup_phb(struct pci_controller *phb)
482{ 482{
483 struct device_node *dev = phb->arch_data; 483 struct device_node *dev = phb->dn;
484 const struct of_device_id *match; 484 const struct of_device_id *match;
485 int (*setup_func)(struct device_node *, struct pci_controller *); 485 int (*setup_func)(struct device_node *, struct pci_controller *);
486 486