6 files changed, 31 insertions, 31 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 88f4ae787832..88b21fccf0c9 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -185,7 +185,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
         axon_ram_bank_id++;
 
         dev_info(&device->dev, "Found memory controller on %s\n",
-                        device->node->full_name);
+                        device->dev.of_node->full_name);
 
         bank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);
         if (bank == NULL) {
@@ -198,7 +198,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
 
         bank->device = device;
 
-        if (of_address_to_resource(device->node, 0, &resource) != 0) {
+        if (of_address_to_resource(device->dev.of_node, 0, &resource) != 0) {
                 dev_err(&device->dev, "Cannot access device tree\n");
                 rc = -EFAULT;
                 goto failed;
@@ -253,7 +253,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
         blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
         add_disk(bank->disk);
 
-        bank->irq_id = irq_of_parse_and_map(device->node, 0);
+        bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
         if (bank->irq_id == NO_IRQ) {
                 dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                 rc = -EFAULT;
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index 378ebd9aac18..d32d5389b67a 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -377,7 +377,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
         printk(KERN_INFO "DMA: MPC52xx BestComm driver\n");
 
         /* Get the bestcomm node */
-        of_node_get(op->node);
+        of_node_get(op->dev.of_node);
 
         /* Prepare SRAM */
         ofn_sram = of_find_matching_node(NULL, mpc52xx_sram_ids);
@@ -406,10 +406,10 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
         }
 
         /* Save the node */
-        bcom_eng->ofnode = op->node;
+        bcom_eng->ofnode = op->dev.of_node;
 
         /* Get, reserve & map io */
-        if (of_address_to_resource(op->node, 0, &res_bcom)) {
+        if (of_address_to_resource(op->dev.of_node, 0, &res_bcom)) {
                 printk(KERN_ERR DRIVER_NAME ": "
                         "Can't get resource\n");
                 rv = -EINVAL;
@@ -453,7 +453,7 @@ error_sramclean:
         kfree(bcom_eng);
         bcom_sram_cleanup();
 error_ofput:
-        of_node_put(op->node);
+        of_node_put(op->dev.of_node);
 
         printk(KERN_ERR "DMA: MPC52xx BestComm init failed !\n");
 
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 3482e3fd89c0..569dae8ea1ce 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -249,7 +249,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
                 goto error_out;
         }
 
-        msi->irqhost = irq_alloc_host(dev->node, IRQ_HOST_MAP_LINEAR,
+        msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR,
                                       NR_MSI_IRQS, &fsl_msi_host_ops, 0);
 
         if (msi->irqhost == NULL) {
@@ -259,10 +259,10 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
         }
 
         /* Get the MSI reg base */
-        err = of_address_to_resource(dev->node, 0, &res);
+        err = of_address_to_resource(dev->dev.of_node, 0, &res);
         if (err) {
                 dev_err(&dev->dev, "%s resource error!\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 goto error_out;
         }
 
@@ -285,16 +285,16 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
                 goto error_out;
         }
 
-        p = of_get_property(dev->node, "interrupts", &count);
+        p = of_get_property(dev->dev.of_node, "interrupts", &count);
         if (!p) {
                 dev_err(&dev->dev, "no interrupts property found on %s\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 err = -ENODEV;
                 goto error_out;
         }
         if (count % 8 != 0) {
                 dev_err(&dev->dev, "Malformed interrupts property on %s\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 err = -EINVAL;
                 goto error_out;
         }
@@ -303,7 +303,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
         for (i = 0; i < count / 2; i++) {
                 if (i > NR_MSI_REG)
                         break;
-                virt_msir = irq_of_parse_and_map(dev->node, i);
+                virt_msir = irq_of_parse_and_map(dev->dev.of_node, i);
                 if (virt_msir != NO_IRQ) {
                         set_irq_data(virt_msir, (void *)i);
                         set_irq_chained_handler(virt_msir, fsl_msi_cascade);
diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c
index a7635a993dca..2ebe817ca72f 100644
--- a/arch/powerpc/sysdev/fsl_pmc.c
+++ b/arch/powerpc/sysdev/fsl_pmc.c
@@ -60,7 +60,7 @@ static struct platform_suspend_ops pmc_suspend_ops = {
 
 static int pmc_probe(struct of_device *ofdev, const struct of_device_id *id)
 {
-        pmc_regs = of_iomap(ofdev->node, 0);
+        pmc_regs = of_iomap(ofdev->dev.of_node, 0);
         if (!pmc_regs)
                 return -ENOMEM;
 
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 71fba88f50db..a98d51639243 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1015,41 +1015,41 @@ int fsl_rio_setup(struct of_device *dev)
         u64 law_start, law_size;
         int paw, aw, sw;
 
-        if (!dev->node) {
+        if (!dev->dev.of_node) {
                 dev_err(&dev->dev, "Device OF-Node is NULL");
                 return -EFAULT;
         }
 
-        rc = of_address_to_resource(dev->node, 0, &regs);
+        rc = of_address_to_resource(dev->dev.of_node, 0, &regs);
         if (rc) {
                 dev_err(&dev->dev, "Can't get %s property 'reg'\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 return -EFAULT;
         }
-        dev_info(&dev->dev, "Of-device full name %s\n", dev->node->full_name);
+        dev_info(&dev->dev, "Of-device full name %s\n", dev->dev.of_node->full_name);
         dev_info(&dev->dev, "Regs: %pR\n", &regs);
 
-        dt_range = of_get_property(dev->node, "ranges", &rlen);
+        dt_range = of_get_property(dev->dev.of_node, "ranges", &rlen);
         if (!dt_range) {
                 dev_err(&dev->dev, "Can't get %s property 'ranges'\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 return -EFAULT;
         }
 
         /* Get node address wide */
-        cell = of_get_property(dev->node, "#address-cells", NULL);
+        cell = of_get_property(dev->dev.of_node, "#address-cells", NULL);
         if (cell)
                 aw = *cell;
         else
-                aw = of_n_addr_cells(dev->node);
+                aw = of_n_addr_cells(dev->dev.of_node);
         /* Get node size wide */
-        cell = of_get_property(dev->node, "#size-cells", NULL);
+        cell = of_get_property(dev->dev.of_node, "#size-cells", NULL);
         if (cell)
                 sw = *cell;
         else
-                sw = of_n_size_cells(dev->node);
+                sw = of_n_size_cells(dev->dev.of_node);
         /* Get parent address wide wide */
-        paw = of_n_addr_cells(dev->node);
+        paw = of_n_addr_cells(dev->dev.of_node);
 
         law_start = of_read_number(dt_range + aw, paw);
         law_size = of_read_number(dt_range + aw + paw, sw);
@@ -1089,9 +1089,9 @@ int fsl_rio_setup(struct of_device *dev)
         port->iores.flags = IORESOURCE_MEM;
         port->iores.name = "rio_io_win";
 
-        priv->bellirq = irq_of_parse_and_map(dev->node, 2);
-        priv->txirq = irq_of_parse_and_map(dev->node, 3);
-        priv->rxirq = irq_of_parse_and_map(dev->node, 4);
+        priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);
+        priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);
+        priv->rxirq = irq_of_parse_and_map(dev->dev.of_node, 4);
         dev_info(&dev->dev, "bellirq: %d, txirq: %d, rxirq %d\n", priv->bellirq,
                                 priv->txirq, priv->rxirq);
 
@@ -1195,7 +1195,7 @@ static int __devinit fsl_of_rio_rpn_probe(struct of_device *dev,
 {
         int rc;
         printk(KERN_INFO "Setting up RapidIO peer-to-peer network %s\n",
-                        dev->node->full_name);
+                        dev->dev.of_node->full_name);
 
         rc = fsl_rio_setup(dev);
         if (rc)
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c
index 652652db4ce2..ff758bff1b7a 100644
--- a/arch/powerpc/sysdev/pmi.c
+++ b/arch/powerpc/sysdev/pmi.c
@@ -124,7 +124,7 @@ static void pmi_notify_handlers(struct work_struct *work)
 static int pmi_of_probe(struct of_device *dev,
                         const struct of_device_id *match)
 {
-        struct device_node *np = dev->node;
+        struct device_node *np = dev->dev.of_node;
         int rc;
 
         if (data) {