irqchip/metag-ext: Use irq_set_chip_handler_name_locked()

Hand in irq_data and avoid the redundant lookup of irq_desc.

Originally-from: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/irqchip/irq-metag-ext.c b/drivers/irqchip/irq-metag-ext.c
index 2cb474ad8809faa2fadaf5b08a7b06b087e73794..5f4c52928d1671b99cfc759552562bd5b8d09691 100644 (file)
--- a/drivers/irqchip/irq-metag-ext.c
+++ b/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);