Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[firefly-linux-kernel-4.4.55.git] / drivers / irqchip / irq-metag.c

diff --git a/drivers/irqchip/irq-metag.c b/drivers/irqchip/irq-metag.c
index c16c186d97d35f4246fa2acbd17942789922d6d7..3d23ce3edb5cccc8b50073af72633e0b3b3ed11f 100644 (file)
--- a/drivers/irqchip/irq-metag.c
+++ b/drivers/irqchip/irq-metag.c
@@ -286,8 +286,7 @@ static void metag_internal_irq_init_cpu(struct metag_internal_irq_priv *priv,
        int irq = tbisig_map(signum);
 
        /* Register the multiplexed IRQ handler */
-       irq_set_handler_data(irq, priv);
-       irq_set_chained_handler(irq, metag_internal_irq_demux);
+       irq_set_chained_handler_and_data(irq, metag_internal_irq_demux, priv);
        irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW);
 }