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

[sfrench/cifs-2.6.git] / arch / blackfin / mach-common / ints-priority.c

diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 7236bdfc71e6ae330efa1efb29ffbb8b79c3cf47..a6d1b03cdf3693d2905e27ff113f6bbe34c7c056 100644 (file)
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned int irq)
 #ifdef CONFIG_SMP
 static void bfin_internal_unmask_irq_chip(struct irq_data *d)
 {
-       bfin_internal_unmask_irq_affinity(d->irq, d->affinity);
+       bfin_internal_unmask_irq_affinity(d->irq,
+                                         irq_data_get_affinity_mask(d));
 }
 
 static int bfin_internal_set_affinity(struct irq_data *d,
@@ -685,12 +686,12 @@ void bfin_demux_mac_status_irq(unsigned int int_err_irq,
 }
 #endif
 
-static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
+static inline void bfin_set_irq_handler(struct irq_data *d, irq_flow_handler_t handle)
 {
 #ifdef CONFIG_IPIPE
        handle = handle_level_irq;
 #endif
-       __irq_set_handler_locked(irq, handle);
+       irq_set_handler_locked(d, handle);
 }
 
 #ifdef CONFIG_GPIO_ADI
@@ -802,9 +803,9 @@ static int bfin_gpio_irq_type(struct irq_data *d, unsigned int type)
        }
 
        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-               bfin_set_irq_handler(irq, handle_edge_irq);
+               bfin_set_irq_handler(d, handle_edge_irq);
        else
-               bfin_set_irq_handler(irq, handle_level_irq);
+               bfin_set_irq_handler(d, handle_level_irq);
 
        return 0;
 }
@@ -824,9 +825,9 @@ static void bfin_demux_gpio_block(unsigned int irq)
        }
 }
 
-void bfin_demux_gpio_irq(unsigned int inta_irq,
-                       struct irq_desc *desc)
+void bfin_demux_gpio_irq(unsigned int __inta_irq, struct irq_desc *desc)
 {
+       unsigned int inta_irq = irq_desc_get_irq(desc);
        unsigned int irq;
 
        switch (inta_irq) {