These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / irqchip / irq-metag-ext.c

diff --git a/kernel/drivers/irqchip/irq-metag-ext.c b/kernel/drivers/irqchip/irq-metag-ext.c
index 2cb474a..8c38b3d 100644 (file)
--- a/kernel/drivers/irqchip/irq-metag-ext.c
+++ b/kernel/drivers/irqchip/irq-metag-ext.c
@@ -404,7 +404,6 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)
 #ifdef CONFIG_METAG_SUSPEND_MEM
        struct meta_intc_priv *priv = &meta_intc_priv;
 #endif
-       unsigned int irq = data->irq;
        irq_hw_number_t hw = data->hwirq;
        unsigned int bit = 1 << meta_intc_offset(hw);
        void __iomem *level_addr = meta_intc_level_addr(hw);
@@ -413,11 +412,11 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)
 
        /* update the chip/handler */
        if (flow_type & IRQ_TYPE_LEVEL_MASK)
-               __irq_set_chip_handler_name_locked(irq, &meta_intc_level_chip,
-                                                  handle_level_irq, NULL);
+               irq_set_chip_handler_name_locked(data, &meta_intc_level_chip,
+                                                handle_level_irq, NULL);
        else
-               __irq_set_chip_handler_name_locked(irq, &meta_intc_edge_chip,
-                                                  handle_edge_irq, NULL);
+               irq_set_chip_handler_name_locked(data, &meta_intc_edge_chip,
+                                                handle_edge_irq, NULL);
 
        /* and clear/set the bit in HWLEVELEXT */
        __global_lock2(flags);
@@ -447,7 +446,7 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)
  * Whilst using TR2 to detect external interrupts is a software convention it is
  * (hopefully) unlikely to change.
  */
-static void meta_intc_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void meta_intc_irq_demux(struct irq_desc *desc)
 {
        struct meta_intc_priv *priv = &meta_intc_priv;
        irq_hw_number_t hw;