genirq: Remove irq argument from irq flow handlers

[linux-drm-fsl-dcu.git] / drivers / mfd / jz4740-adc.c

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index b31c54e4ecb2490e3d4107fdfcfbc21105e56c58..798e44306382e1bb12dc37a3727d74a912846631 100644 (file)
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -65,7 +65,7 @@ struct jz4740_adc {
        spinlock_t lock;
 };
 
-static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void jz4740_adc_irq_demux(struct irq_desc *desc)
 {
        struct irq_chip_generic *gc = irq_desc_get_handler_data(desc);
        uint8_t status;
@@ -273,12 +273,12 @@ static int jz4740_adc_probe(struct platform_device *pdev)
        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
        ct->chip.irq_ack = irq_gc_ack_set_bit;
 
-       irq_setup_generic_chip(gc, IRQ_MSK(5), 0, 0, IRQ_NOPROBE | IRQ_LEVEL);
+       irq_setup_generic_chip(gc, IRQ_MSK(5), IRQ_GC_INIT_MASK_CACHE, 0,
+                               IRQ_NOPROBE | IRQ_LEVEL);
 
        adc->gc = gc;
 
-       irq_set_handler_data(adc->irq, gc);
-       irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux);
+       irq_set_chained_handler_and_data(adc->irq, jz4740_adc_irq_demux, gc);
 
        writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
        writeb(0xff, adc->base + JZ_REG_ADC_CTRL);
@@ -308,8 +308,7 @@ static int jz4740_adc_remove(struct platform_device *pdev)
 
        irq_remove_generic_chip(adc->gc, IRQ_MSK(5), IRQ_NOPROBE | IRQ_LEVEL, 0);
        kfree(adc->gc);
-       irq_set_handler_data(adc->irq, NULL);
-       irq_set_chained_handler(adc->irq, NULL);
+       irq_set_chained_handler_and_data(adc->irq, NULL, NULL);
 
        iounmap(adc->base);
        release_mem_region(adc->mem->start, resource_size(adc->mem));