2 files changed, 3 insertions, 11 deletions

diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 1962bfa4ef3..0ace17bafba 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -438,11 +438,9 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
 
 void __init ebus_init(void)
 {
-        struct pci_pbm_info *pbm;
         struct linux_ebus_device *dev;
         struct linux_ebus *ebus;
         struct pci_dev *pdev;
-        struct pcidev_cookie *cookie;
         struct device_node *dp;
         int is_rio;
         int num_ebus = 0;
@@ -453,8 +451,7 @@ void __init ebus_init(void)
                 return;
         }
 
-        cookie = pdev->sysdata;
-        dp = cookie->prom_node;
+        dp = pci_device_to_OF_node(pdev);
 
         ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));
         ebus->next = NULL;
@@ -480,8 +477,7 @@ void __init ebus_init(void)
                                 break;
                         }
                         ebus->is_rio = is_rio;
-                        cookie = pdev->sysdata;
-                        dp = cookie->prom_node;
+                        dp = pci_device_to_OF_node(pdev);
                         continue;
                 }
                 printk("ebus%d:", num_ebus);
@@ -489,7 +485,6 @@ void __init ebus_init(void)
                 ebus->index = num_ebus;
                 ebus->prom_node = dp;
                 ebus->self = pdev;
-                ebus->parent = pbm = cookie->pbm;
 
                 ebus->ofdev.node = dp;
                 ebus->ofdev.dev.parent = &pdev->dev;
@@ -531,8 +526,7 @@ void __init ebus_init(void)
                 if (!pdev)
                         break;
 
-                cookie = pdev->sysdata;
-                dp = cookie->prom_node;
+                dp = pci_device_to_OF_node(pdev);
 
                 ebus->next = ebus_alloc(sizeof(struct linux_ebus));
                 ebus = ebus->next;
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h
index a4afe9d5703..9c1c6db2a79 100644
--- a/include/asm-sparc64/ebus.h
+++ b/include/asm-sparc64/ebus.h
@@ -8,7 +8,6 @@
 #ifndef __SPARC64_EBUS_H
 #define __SPARC64_EBUS_H
 
-#include <asm/pbm.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
 #include <asm/of_device.h>
@@ -41,7 +40,6 @@ struct linux_ebus {
         struct of_device                ofdev;
         struct linux_ebus               *next;
         struct linux_ebus_device        *devices;
-        struct pci_pbm_info             *parent;
         struct pci_dev                  *self;
         int                              index;
         int                              is_rio;