diff options
| author | David Daney | 2016-02-09 20:00:13 +0100 |
|---|---|---|
| committer | Ralf Baechle | 2016-05-13 14:01:41 +0200 |
| commit | 490f7548cfce36b63ec517a8ff7382287db86c29 (patch) | |
| tree | bce797c6438e75ee3408e7e484e82b09b4c7876c | |
| parent | MIPS: OCTEON: Add SMP support for OCTEON cn78xx et al. (diff) | |
| download | kernel-qcow2-linux-490f7548cfce36b63ec517a8ff7382287db86c29.tar.gz kernel-qcow2-linux-490f7548cfce36b63ec517a8ff7382287db86c29.tar.xz kernel-qcow2-linux-490f7548cfce36b63ec517a8ff7382287db86c29.zip | |
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 <david.daney@cavium.com>
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 <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |