[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-5ebf1f29e20de9b37937f808dc2ac8dd15311450@git.kernel.org>
Date: Tue, 25 Jun 2013 02:53:04 -0700
From: tip-bot for Javier Martinez Canillas <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, jason@...edaemon.net,
grant.likely@...aro.org, hpa@...or.com, mingo@...nel.org,
javier.martinez@...labora.co.uk, benh@...nel.crashing.org,
ralf@...ux-mips.org, linux@....linux.org.uk, andrew@...n.ch,
david.daney@...ium.com, tglx@...utronix.de, sameo@...ux.intel.com,
linus.walleij@...aro.org
Subject: [tip:irq/core] MIPS: octeon: Use irq_get_trigger_type()
to get IRQ flags
Commit-ID: 5ebf1f29e20de9b37937f808dc2ac8dd15311450
Gitweb: http://git.kernel.org/tip/5ebf1f29e20de9b37937f808dc2ac8dd15311450
Author: Javier Martinez Canillas <javier.martinez@...labora.co.uk>
AuthorDate: Fri, 14 Jun 2013 18:40:48 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 25 Jun 2013 11:48:25 +0200
MIPS: octeon: Use irq_get_trigger_type() to get IRQ flags
Use irq_get_trigger_type() to get the IRQ trigger type flags
instead calling irqd_get_trigger_type(irq_desc_get_irq_data(irq))
Signed-off-by: Javier Martinez Canillas <javier.martinez@...labora.co.uk>
Acked-by: David Daney <david.daney@...ium.com>
Cc: Grant Likely <grant.likely@...aro.org>
Cc: Linus Walleij <linus.walleij@...aro.org>
Cc: Samuel Ortiz <sameo@...ux.intel.com>
Cc: Jason Cooper <jason@...edaemon.net>
Cc: Andrew Lunn <andrew@...n.ch>
Cc: Russell King <linux@....linux.org.uk>
Cc: Ralf Baechle <ralf@...ux-mips.org>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linux-mips@...ux-mips.org
Link: http://lkml.kernel.org/r/1371228049-27080-7-git-send-email-javier.martinez@collabora.co.uk
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/mips/cavium-octeon/octeon-irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index a22f06a..7181def 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -607,7 +607,7 @@ static void octeon_irq_ciu_gpio_ack(struct irq_data *data)
static void octeon_irq_handle_gpio(unsigned int irq, struct irq_desc *desc)
{
- if (irqd_get_trigger_type(irq_desc_get_irq_data(desc)) & IRQ_TYPE_EDGE_BOTH)
+ if (irq_get_trigger_type(irq) & IRQ_TYPE_EDGE_BOTH)
handle_edge_irq(irq, desc);
else
handle_level_irq(irq, desc);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists