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

[cascardo/linux.git] / arch / powerpc / sysdev / cpm1.c

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 0085212..8b5aba2 100644 (file)
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -56,32 +56,32 @@ static cpic8xx_t __iomem *cpic_reg;
 
 static struct irq_host *cpm_pic_host;
 
-static void cpm_mask_irq(unsigned int irq)
+static void cpm_mask_irq(struct irq_data *d)
 {
-       unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq;
+       unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
 
        clrbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
 }
 
-static void cpm_unmask_irq(unsigned int irq)
+static void cpm_unmask_irq(struct irq_data *d)
 {
-       unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq;
+       unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
 
        setbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
 }
 
-static void cpm_end_irq(unsigned int irq)
+static void cpm_end_irq(struct irq_data *d)
 {
-       unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq;
+       unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
 
        out_be32(&cpic_reg->cpic_cisr, (1 << cpm_vec));
 }
 
 static struct irq_chip cpm_pic = {
        .name = "CPM PIC",
-       .mask = cpm_mask_irq,
-       .unmask = cpm_unmask_irq,
-       .eoi = cpm_end_irq,
+       .irq_mask = cpm_mask_irq,
+       .irq_unmask = cpm_unmask_irq,
+       .irq_eoi = cpm_end_irq,
 };
 
 int cpm_get_irq(void)
@@ -103,8 +103,8 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
 {
        pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
-       irq_to_desc(virq)->status |= IRQ_LEVEL;
-       set_irq_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
+       irq_set_status_flags(virq, IRQ_LEVEL);
+       irq_set_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
        return 0;
 }