2 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index bb5ebf8fa80b..1e3329e8578b 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -113,7 +113,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 pr_devel("axon_msi: woff %x roff %x msi %x\n",
                           write_offset, msic->read_offset, msi);
 
-                if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) {
+                if (msi < NR_IRQS && virq_to_host(msi) == msic->irq_host) {
                         generic_handle_irq(msi);
                         msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
                 } else {
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index c5cf50e6b45a..34d2b99d10c3 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -70,7 +70,7 @@ static struct spider_pic spider_pics[SPIDER_CHIP_COUNT];
 
 static struct spider_pic *spider_virq_to_pic(unsigned int virq)
 {
-        return irq_map[virq].host->host_data;
+        return virq_to_host(virq)->host_data;
 }
 
 static void __iomem *spider_get_irq_config(struct spider_pic *pic,
@@ -82,7 +82,7 @@ static void __iomem *spider_get_irq_config(struct spider_pic *pic,
 static void spider_unmask_irq(struct irq_data *d)
 {
         struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[d->irq].hwirq);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) | 0x30000000u);
 }
@@ -90,7 +90,7 @@ static void spider_unmask_irq(struct irq_data *d)
 static void spider_mask_irq(struct irq_data *d)
 {
         struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[d->irq].hwirq);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) & ~0x30000000u);
 }
@@ -98,7 +98,7 @@ static void spider_mask_irq(struct irq_data *d)
 static void spider_ack_irq(struct irq_data *d)
 {
         struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
 
         /* Reset edge detection logic if necessary
          */
@@ -117,7 +117,7 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type)
 {
         unsigned int sense = type & IRQ_TYPE_SENSE_MASK;
         struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        unsigned int hw = irq_map[d->irq].hwirq;
+        unsigned int hw = irqd_to_hwirq(d);
         void __iomem *cfg = spider_get_irq_config(pic, hw);
         u32 old_mask;
         u32 ic;