From: David Daney Date: Tue, 9 Feb 2016 19:00:13 +0000 (-0800) Subject: MIPS: OCTEON: Simplify code in octeon_irq_ciu_gpio_set_type() X-Git-Tag: v4.7-rc1~122^2~224 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=490f7548cfce36b63ec517a8ff7382287db86c29;p=karo-tx-linux.git MIPS: OCTEON: Simplify code in octeon_irq_ciu_gpio_set_type() Use the trigger type passed in to the function instead of reading it back out of the irq_data. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/12501/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 9b6a65b959f9..368eb490354c 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -713,7 +713,7 @@ static int octeon_irq_ciu_gpio_set_type(struct irq_data *data, unsigned int t) irqd_set_trigger_type(data, t); octeon_irq_gpio_setup(data); - if (irqd_get_trigger_type(data) & IRQ_TYPE_EDGE_BOTH) + if (t & IRQ_TYPE_EDGE_BOTH) irq_set_handler_locked(data, handle_edge_irq); else irq_set_handler_locked(data, handle_level_irq);