Merge commit 'kumar/next' into next

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_msi.c

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index f7ca9e6fa5f027188845b94e428e214bdbbfa0c5..0f5bee90ee4e2b572ff28a68431af2b51b60d825 100644 (file)
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -297,7 +297,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
        }
        dev->dev.platform_data = msi;
 
-       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) {
@@ -307,10 +307,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;
        }
 
@@ -333,16 +333,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;
        }
@@ -353,7 +353,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
 
        count /= sizeof(u32);
        for (i = 0; i < min(count / 2, NR_MSI_REG); i++) {
-               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) {
                        cascade_data = kzalloc(
                                        sizeof(struct fsl_msi_cascade_data),
@@ -413,8 +413,11 @@ static const struct of_device_id fsl_of_msi_ids[] = {
 };
 
 static struct of_platform_driver fsl_of_msi_driver = {
-       .name = "fsl-msi",
-       .match_table = fsl_of_msi_ids,
+       .driver = {
+               .name = "fsl-msi",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_of_msi_ids,
+       },
        .probe = fsl_of_msi_probe,
        .remove = fsl_of_msi_remove,
 };