powerpc/irq: Stop exporting irq_map

[pandora-kernel.git] / arch / powerpc / platforms / embedded6xx / flipper-pic.c

diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 9d6c3ab..77cbe4c 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -48,7 +48,7 @@
 
 static void flipper_pic_mask_and_ack(struct irq_data *d)
 {
-       int irq = virq_to_hw(d->irq);
+       int irq = irqd_to_hwirq(d);
        void __iomem *io_base = irq_data_get_irq_chip_data(d);
        u32 mask = 1 << irq;
 
@@ -59,7 +59,7 @@ static void flipper_pic_mask_and_ack(struct irq_data *d)
 
 static void flipper_pic_ack(struct irq_data *d)
 {
-       int irq = virq_to_hw(d->irq);
+       int irq = irqd_to_hwirq(d);
        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
        /* this is at least needed for RSW */
@@ -68,7 +68,7 @@ static void flipper_pic_ack(struct irq_data *d)
 
 static void flipper_pic_mask(struct irq_data *d)
 {
-       int irq = virq_to_hw(d->irq);
+       int irq = irqd_to_hwirq(d);
        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
        clrbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -76,7 +76,7 @@ static void flipper_pic_mask(struct irq_data *d)
 
 static void flipper_pic_unmask(struct irq_data *d)
 {
-       int irq = virq_to_hw(d->irq);
+       int irq = irqd_to_hwirq(d);
        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
        setbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -101,16 +101,16 @@ static struct irq_host *flipper_irq_host;
 static int flipper_pic_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hwirq)
 {
-       set_irq_chip_data(virq, h->host_data);
+       irq_set_chip_data(virq, h->host_data);
        irq_set_status_flags(virq, IRQ_LEVEL);
-       set_irq_chip_and_handler(virq, &flipper_pic, handle_level_irq);
+       irq_set_chip_and_handler(virq, &flipper_pic, handle_level_irq);
        return 0;
 }
 
 static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
 {
-       set_irq_chip_data(irq, NULL);
-       set_irq_chip(irq, NULL);
+       irq_set_chip_data(irq, NULL);
+       irq_set_chip(irq, NULL);
 }
 
 static int flipper_pic_match(struct irq_host *h, struct device_node *np)