Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / platforms / 512x / mpc5121_ads_cpld.c

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index 4ecf4cf..cfc4b20 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -59,9 +59,9 @@ irq_to_pic_bit(unsigned int irq)
 }
 
 static void
-cpld_mask_irq(unsigned int irq)
+cpld_mask_irq(struct irq_data *d)
 {
-       unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+       unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
        void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
        out_8(pic_mask,
@@ -69,9 +69,9 @@ cpld_mask_irq(unsigned int irq)
 }
 
 static void
-cpld_unmask_irq(unsigned int irq)
+cpld_unmask_irq(struct irq_data *d)
 {
-       unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+       unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
        void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
        out_8(pic_mask,
@@ -80,9 +80,9 @@ cpld_unmask_irq(unsigned int irq)
 
 static struct irq_chip cpld_pic = {
        .name = "CPLD PIC",
-       .mask = cpld_mask_irq,
-       .ack = cpld_mask_irq,
-       .unmask = cpld_unmask_irq,
+       .irq_mask = cpld_mask_irq,
+       .irq_ack = cpld_mask_irq,
+       .irq_unmask = cpld_unmask_irq,
 };
 
 static int
@@ -132,8 +132,8 @@ static int
 cpld_pic_host_map(struct irq_host *h, unsigned int virq,
                             irq_hw_number_t hw)
 {
-       irq_to_desc(virq)->status |= IRQ_LEVEL;
-       set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq);
+       irq_set_status_flags(virq, IRQ_LEVEL);
+       irq_set_chip_and_handler(virq, &cpld_pic, handle_level_irq);
        return 0;
 }
 
@@ -198,7 +198,7 @@ mpc5121_ads_cpld_pic_init(void)
                goto end;
        }
 
-       set_irq_chained_handler(cascade_irq, cpld_pic_cascade);
+       irq_set_chained_handler(cascade_irq, cpld_pic_cascade);
 end:
        of_node_put(np);
 }