7 files changed, 23 insertions, 28 deletions

diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index 40bc371096b7..e8d34d1f640d 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -486,7 +486,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
                                      struct pci_controller *phb)
 {
         struct resource r;
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         int virq;
 
         /* SMMIO registers; used inside this file */
@@ -511,8 +511,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
                 pr_err("PCIEXC:Failed to map irq\n");
                 goto error;
         }
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
+        virq = irq_create_of_mapping(oirq.np, oirq.args, oirq.args_count);
         if (request_irq(virq, pciex_handle_internal_irq,
                         0, "pciex", (void *)phb)) {
                 pr_err("PCIEXC:Failed to request irq\n");
diff --git a/arch/powerpc/platforms/cell/celleb_scc_sio.c b/arch/powerpc/platforms/cell/celleb_scc_sio.c
index 96388b202f4e..06046d512130 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_sio.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_sio.c
@@ -45,7 +45,7 @@ static int __init txx9_serial_init(void)
         struct device_node *node;
         int i;
         struct uart_port req;
-        struct of_irq irq;
+        struct of_phandle_args irq;
         struct resource res;
 
         for_each_compatible_node(node, "serial", "toshiba,sio-scc") {
@@ -66,8 +66,7 @@ static int __init txx9_serial_init(void)
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
                         req.membase = ioremap(req.mapbase, 0x24);
 #endif
-                        req.irq = irq_create_of_mapping(irq.controller,
-                                irq.specifier, irq.size);
+                        req.irq = irq_create_of_mapping(irq.np, irq.args, irq.args_count);
                         req.flags |= UPF_IOREMAP | UPF_BUGGY_UART
                                 /*HAVE_CTS_LINE*/;
                         req.uartclk = 83300000;
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index b491f406560a..6e842fdbfcab 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -235,10 +235,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
         /* First, we check whether we have a real "interrupts" in the device
          * tree in case the device-tree is ever fixed
          */
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         if (of_irq_parse_one(pic->host->of_node, 0, &oirq) == 0) {
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
+                virq = irq_create_of_mapping(oirq.np, oirq.args,
+                                             oirq.args_count);
                 return virq;
         }
 
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index e6cdb81a0959..e9eb4f83b1d5 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -177,7 +177,7 @@ out:
 
 static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 {
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         int ret;
         int i;
 
@@ -188,10 +188,10 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
                         goto err;
                 }
                 ret = -EINVAL;
-                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
-                         oirq.controller->full_name);
-                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
-                                        oirq.specifier, oirq.size);
+                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.args[0],
+                         oirq.np->full_name);
+                spu->irqs[i] = irq_create_of_mapping(oirq.np,
+                                        oirq.args, oirq.args_count);
                 if (spu->irqs[i] == NO_IRQ) {
                         pr_debug("spu_new: failed to map it !\n");
                         goto err;
@@ -200,7 +200,7 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
         return 0;
 
 err:
-        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier,
+        pr_debug("failed to map irq %x for spu %s\n", *oirq.args,
                 spu->name);
         for (; i >= 0; i--) {
                 if (spu->irqs[i] != NO_IRQ)
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index ac539c1cd808..288226deffa3 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -321,8 +321,8 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
 {
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
         struct device_node *hosenode = hose ? hose->dn : NULL;
-        struct of_irq oirq;
-        int virq, pin = 2;
+        struct of_phandle_args oirq;
+        int pin = 2;
         u32 laddr[3];
 
         if (!machine_is(mpc86xx_hpcd))
@@ -334,9 +334,7 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
         laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(31, 0) << 8);
         laddr[1] = laddr[2] = 0;
         of_irq_parse_raw(hosenode, &pin, 1, laddr, &oirq);
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
-        dev->irq = virq;
+        dev->irq = irq_create_of_mapping(oirq.np, oirq.args, oirq.args_count);
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, hpcd_quirk_uli1575);
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 720663e29f47..4c24bf60d39d 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -394,7 +394,7 @@ static void __init pmac_pic_probe_oldstyle(void)
 }
 
 int of_irq_parse_oldworld(struct device_node *device, int index,
-                        struct of_irq *out_irq)
+                        struct of_phandle_args *out_irq)
 {
         const u32 *ints = NULL;
         int intlen;
@@ -422,9 +422,9 @@ int of_irq_parse_oldworld(struct device_node *device, int index,
         if (index >= intlen)
                 return -EINVAL;
 
-        out_irq->controller = NULL;
-        out_irq->specifier[0] = ints[index];
-        out_irq->size = 1;
+        out_irq->np = NULL;
+        out_irq->args[0] = ints[index];
+        out_irq->args_count = 1;
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c
index 850c18c457ad..6dcf9cc38ffb 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -25,7 +25,7 @@ void request_event_sources_irqs(struct device_node *np,
                                 const char *name)
 {
         int i, index, count = 0;
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         const u32 *opicprop;
         unsigned int opicplen;
         unsigned int virqs[16];
@@ -59,9 +59,8 @@ void request_event_sources_irqs(struct device_node *np,
                      index++) {
                         if (count > 15)
                                 break;
-                        virqs[count] = irq_create_of_mapping(oirq.controller,
-                                                            oirq.specifier,
-                                                            oirq.size);
+                        virqs[count] = irq_create_of_mapping(oirq.np, oirq.args,
+                                                            oirq.args_count);
                         if (virqs[count] == NO_IRQ) {
                                 pr_err("event-sources: Unable to allocate "
                                        "interrupt number for %s\n",