1 files changed, 6 insertions, 8 deletions

diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 442c28c00f88..d8b7cc8a66ca 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -62,7 +62,7 @@ enum {
 #define SPIDER_IRQ_INVALID      63
 
 struct spider_pic {
-        struct irq_host         *host;
+        struct irq_domain               *host;
         void __iomem            *regs;
         unsigned int            node_id;
 };
@@ -168,7 +168,7 @@ static struct irq_chip spider_pic = {
         .irq_set_type = spider_set_irq_type,
 };
 
-static int spider_host_map(struct irq_host *h, unsigned int virq,
+static int spider_host_map(struct irq_domain *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
         irq_set_chip_data(virq, h->host_data);
@@ -180,7 +180,7 @@ static int spider_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static int spider_host_xlate(struct irq_host *h, struct device_node *ct,
+static int spider_host_xlate(struct irq_domain *h, struct device_node *ct,
                            const u32 *intspec, unsigned int intsize,
                            irq_hw_number_t *out_hwirq, unsigned int *out_flags)
 
@@ -194,7 +194,7 @@ static int spider_host_xlate(struct irq_host *h, struct device_node *ct,
         return 0;
 }
 
-static struct irq_host_ops spider_host_ops = {
+static const struct irq_domain_ops spider_host_ops = {
         .map = spider_host_map,
         .xlate = spider_host_xlate,
 };
@@ -299,12 +299,10 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
                 panic("spider_pic: can't map registers !");
 
         /* Allocate a host */
-        pic->host = irq_alloc_host(of_node, IRQ_HOST_MAP_LINEAR,
-                                   SPIDER_SRC_COUNT, &spider_host_ops,
-                                   SPIDER_IRQ_INVALID);
+        pic->host = irq_domain_add_linear(of_node, SPIDER_SRC_COUNT,
+                                          &spider_host_ops, pic);
         if (pic->host == NULL)
                 panic("spider_pic: can't allocate irq host !");
-        pic->host->host_data = pic;
 
         /* Go through all sources and disable them */
         for (i = 0; i < SPIDER_SRC_COUNT; i++) {