35 files changed, 198 insertions, 185 deletions

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index fefa7977fa9f..291d61c94718 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -190,8 +190,7 @@ mpc5121_ads_cpld_pic_init(void)
 
         cpld_pic_node = of_node_get(np);
 
-        cpld_pic_host =
-            irq_alloc_host(np, IRQ_DOMAIN_MAP_LINEAR, 16, &cpld_pic_host_ops, 16);
+        cpld_pic_host = irq_domain_add_linear(np, 16, &cpld_pic_host_ops, NULL);
         if (!cpld_pic_host) {
                 printk(KERN_ERR "CPLD PIC: failed to allocate irq host!\n");
                 goto end;
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index a746415c4242..5db5cfb6a4ff 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -173,15 +173,12 @@ static void __init media5200_init_irq(void)
 
         spin_lock_init(&media5200_irq.lock);
 
-        media5200_irq.irqhost = irq_alloc_host(fpga_np, IRQ_DOMAIN_MAP_LINEAR,
-                                               MEDIA5200_NUM_IRQS,
-                                               &media5200_irq_ops, -1);
+        media5200_irq.irqhost = irq_domain_add_linear(fpga_np,
+                        MEDIA5200_NUM_IRQS, &media5200_irq_ops, &media5200_irq);
         if (!media5200_irq.irqhost)
                 goto out;
         pr_debug("%s: allocated irqhost\n", __func__);
 
-        media5200_irq.irqhost->host_data = &media5200_irq;
-
         irq_set_handler_data(cascade_virq, &media5200_irq);
         irq_set_chained_handler(cascade_virq, media5200_irq_cascade);
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index e90af8fd8413..b53275d12727 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -252,14 +252,12 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         if (!cascade_virq)
                 return;
 
-        gpt->irqhost = irq_alloc_host(node, IRQ_DOMAIN_MAP_LINEAR, 1,
-                                      &mpc52xx_gpt_irq_ops, -1);
+        gpt->irqhost = irq_domain_add_linear(node, 1, &mpc52xx_gpt_irq_ops, gpt);
         if (!gpt->irqhost) {
-                dev_err(gpt->dev, "irq_alloc_host() failed\n");
+                dev_err(gpt->dev, "irq_domain_add_linear() failed\n");
                 return;
         }
 
-        gpt->irqhost->host_data = gpt;
         irq_set_handler_data(cascade_virq, gpt);
         irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 8c997f1a9122..41fa67126c44 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -444,9 +444,9 @@ void __init mpc52xx_init_irq(void)
          * As last step, add an irq host to translate the real
          * hw irq information provided by the ofw to linux virq
          */
-        mpc52xx_irqhost = irq_alloc_host(picnode, IRQ_DOMAIN_MAP_LINEAR,
+        mpc52xx_irqhost = irq_domain_add_linear(picnode,
                                          MPC52xx_IRQ_HIGHTESTHWIRQ,
-                                         &mpc52xx_irqhost_ops, -1);
+                                         &mpc52xx_irqhost_ops, NULL);
 
         if (!mpc52xx_irqhost)
                 panic(__FILE__ ": Cannot allocate the IRQ host\n");
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index bdba174e7b3a..4ef9d6918e23 100644
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -156,17 +156,13 @@ int __init pq2ads_pci_init_irq(void)
         out_be32(&priv->regs->mask, ~0);
         mb();
 
-        host = irq_alloc_host(np, IRQ_DOMAIN_MAP_LINEAR, NUM_IRQS,
-                              &pci_pic_host_ops, NUM_IRQS);
+        host = irq_domain_add_linear(np, NUM_IRQS, &pci_pic_host_ops, priv);
         if (!host) {
                 ret = -ENOMEM;
                 goto out_unmap_regs;
         }
 
-        host->host_data = priv;
-
         priv->host = host;
-        host->host_data = priv;
         irq_set_handler_data(irq, priv);
         irq_set_chained_handler(irq, pq2ads_pci_irq_demux);
 
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index e3ef7c9ed7b1..1092c121adf3 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -280,9 +280,8 @@ void socrates_fpga_pic_init(struct device_node *pic)
         int i;
 
         /* Setup an irq_domain structure */
-        socrates_fpga_pic_irq_host = irq_alloc_host(pic, IRQ_DOMAIN_MAP_LINEAR,
-                        SOCRATES_FPGA_NUM_IRQS, &socrates_fpga_pic_host_ops,
-                        SOCRATES_FPGA_NUM_IRQS);
+        socrates_fpga_pic_irq_host = irq_domain_add_linear(pic,
+                    SOCRATES_FPGA_NUM_IRQS, &socrates_fpga_pic_host_ops, NULL);
         if (socrates_fpga_pic_irq_host == NULL) {
                 pr_err("FPGA PIC: Unable to allocate host\n");
                 return;
diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c
index 0cf8af230bcf..126a94b530e4 100644
--- a/arch/powerpc/platforms/86xx/gef_pic.c
+++ b/arch/powerpc/platforms/86xx/gef_pic.c
@@ -212,9 +212,8 @@ void __init gef_pic_init(struct device_node *np)
         }
 
         /* Setup an irq_domain structure */
-        gef_pic_irq_host = irq_alloc_host(np, IRQ_DOMAIN_MAP_LINEAR,
+        gef_pic_irq_host = irq_domain_add_linear(np, GEF_PIC_NUM_IRQS,