1 files changed, 9 insertions, 6 deletions

diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 23c33ff9c31e..a24af6f7e17f 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -540,7 +540,7 @@ static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
         struct property *prop;
         struct device_node *dp;
 
-        dp = pbm->op->node;
+        dp = pbm->op->dev.of_node;
         prop = of_find_property(dp, "66mhz-capable", NULL);
         pbm->is_66mhz_capable = (prop != NULL);
         pbm->pci_bus = pci_scan_one_pbm(pbm, parent);
@@ -584,7 +584,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
         u32 dma_mask, dma_offset;
         const u32 *vdma;
 
-        vdma = of_get_property(pbm->op->node, "virtual-dma", NULL);
+        vdma = of_get_property(pbm->op->dev.of_node, "virtual-dma", NULL);
         if (!vdma)
                 vdma = vdma_default;
 
@@ -881,7 +881,7 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)
 static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
                                         struct of_device *op, u32 devhandle)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         int err;
 
         pbm->numa_node = of_node_to_nid(dp);
@@ -929,7 +929,7 @@ static int __devinit pci_sun4v_probe(struct of_device *op,
         u32 devhandle;
         int i, err;
 
-        dp = op->node;
+        dp = op->dev.of_node;
 
         if (!hvapi_negotiated++) {
                 err = sun4v_hvapi_register(HV_GRP_PCI,
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = {
 };
 
 static struct of_platform_driver pci_sun4v_driver = {
-        .name           = DRIVER_NAME,
-        .match_table    = pci_sun4v_match,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = pci_sun4v_match,
+        },
         .probe          = pci_sun4v_probe,
 };