1 files changed, 37 insertions, 45 deletions

diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index e9d12058ffd3..47ba4b9b6db1 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -61,45 +61,42 @@ struct eic {
 static struct eic *nmi_eic;
 static bool nmi_enabled;
 
-static void eic_ack_irq(unsigned int irq)
+static void eic_ack_irq(struct irq_chip *d)
 {
-        struct eic *eic = get_irq_chip_data(irq);
-        eic_writel(eic, ICR, 1 << (irq - eic->first_irq));
+        struct eic *eic = irq_data_get_irq_chip_data(data);
+        eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
 }
 
-static void eic_mask_irq(unsigned int irq)
+static void eic_mask_irq(struct irq_chip *d)
 {
-        struct eic *eic = get_irq_chip_data(irq);
-        eic_writel(eic, IDR, 1 << (irq - eic->first_irq));
+        struct eic *eic = irq_data_get_irq_chip_data(data);
+        eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
 }
 
-static void eic_mask_ack_irq(unsigned int irq)
+static void eic_mask_ack_irq(struct irq_chip *d)
 {
-        struct eic *eic = get_irq_chip_data(irq);
-        eic_writel(eic, ICR, 1 << (irq - eic->first_irq));
-        eic_writel(eic, IDR, 1 << (irq - eic->first_irq));
+        struct eic *eic = irq_data_get_irq_chip_data(data);
+        eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
+        eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
 }
 
-static void eic_unmask_irq(unsigned int irq)
+static void eic_unmask_irq(struct irq_chip *d)
 {
-        struct eic *eic = get_irq_chip_data(irq);
-        eic_writel(eic, IER, 1 << (irq - eic->first_irq));
+        struct eic *eic = irq_data_get_irq_chip_data(data);
+        eic_writel(eic, IER, 1 << (d->irq - eic->first_irq));
 }
 
-static int eic_set_irq_type(unsigned int irq, unsigned int flow_type)
+static int eic_set_irq_type(struct irq_chip *d, unsigned int flow_type)
 {
-        struct eic *eic = get_irq_chip_data(irq);
-        struct irq_desc *desc;
+        struct eic *eic = irq_data_get_irq_chip_data(data);
+        unsigned int irq = d->irq;
         unsigned int i = irq - eic->first_irq;
         u32 mode, edge, level;
-        int ret = 0;
 
         flow_type &= IRQ_TYPE_SENSE_MASK;
         if (flow_type == IRQ_TYPE_NONE)
                 flow_type = IRQ_TYPE_LEVEL_LOW;
 
-        desc = &irq_desc[irq];
-
         mode = eic_readl(eic, MODE);
         edge = eic_readl(eic, EDGE);
         level = eic_readl(eic, LEVEL);
@@ -122,39 +119,34 @@ static int eic_set_irq_type(unsigned int irq, unsigned int flow_type)
                 edge &= ~(1 << i);
                 break;
         default:
-                ret = -EINVAL;
-                break;
+                return -EINVAL;
         }
 
-        if (ret == 0) {
-                eic_writel(eic, MODE, mode);
-                eic_writel(eic, EDGE, edge);
-                eic_writel(eic, LEVEL, level);
-
-                if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) {
-                        flow_type |= IRQ_LEVEL;
-                        __set_irq_handler_unlocked(irq, handle_level_irq);
-                } else
-                        __set_irq_handler_unlocked(irq, handle_edge_irq);
-                desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-                desc->status |= flow_type;
-        }
+        eic_writel(eic, MODE, mode);
+        eic_writel(eic, EDGE, edge);
+        eic_writel(eic, LEVEL, level);
 
-        return ret;
+        irqd_set_trigger_type(d, flow_type);
+        if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
+                __irq_set_handler_locked(irq, handle_level_irq);
+        else
+                __irq_set_handler_locked(irq, handle_edge_irq);
+
+        return IRQ_SET_MASK_OK_NOCOPY;
 }
 
 static struct irq_chip eic_chip = {
         .name           = "eic",
-        .ack            = eic_ack_irq,
-        .mask           = eic_mask_irq,
-        .mask_ack       = eic_mask_ack_irq,
-        .unmask         = eic_unmask_irq,
-        .set_type       = eic_set_irq_type,
+        .irq_ack        = eic_ack_irq,
+        .irq_mask       = eic_mask_irq,
+        .irq_mask_ack   = eic_mask_ack_irq,
+        .irq_unmask     = eic_unmask_irq,
+        .irq_set_type   = eic_set_irq_type,
 };
 
 static void demux_eic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct eic *eic = desc->handler_data;
+        struct eic *eic = irq_desc_get_handler_data(desc);
         unsigned long status, pending;
         unsigned int i;
 
@@ -234,13 +226,13 @@ static int __init eic_probe(struct platform_device *pdev)
         eic->chip = &eic_chip;
 
         for (i = 0; i < nr_of_irqs; i++) {
-                set_irq_chip_and_handler(eic->first_irq + i, &eic_chip,
+                irq_set_chip_and_handler(eic->first_irq + i, &eic_chip,
                                          handle_level_irq);
-                set_irq_chip_data(eic->first_irq + i, eic);
+                irq_set_chip_data(eic->first_irq + i, eic);
         }
 
-        set_irq_chained_handler(int_irq, demux_eic_irq);
-        set_irq_data(int_irq, eic);
+        irq_set_chained_handler(int_irq, demux_eic_irq);
+        irq_set_handler_data(int_irq, eic);
 
         if (pdev->id == 0) {
                 nmi_eic = eic;