Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738Ab3FYJxh (ORCPT ); Tue, 25 Jun 2013 05:53:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38412 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719Ab3FYJxc (ORCPT ); Tue, 25 Jun 2013 05:53:32 -0400 Date: Tue, 25 Jun 2013 02:53:04 -0700 From: tip-bot for Javier Martinez Canillas Message-ID: Cc: linux-kernel@vger.kernel.org, jason@lakedaemon.net, grant.likely@linaro.org, hpa@zytor.com, mingo@kernel.org, javier.martinez@collabora.co.uk, benh@kernel.crashing.org, ralf@linux-mips.org, linux@arm.linux.org.uk, andrew@lunn.ch, david.daney@cavium.com, tglx@linutronix.de, sameo@linux.intel.com, linus.walleij@linaro.org Reply-To: mingo@kernel.org, hpa@zytor.com, grant.likely@linaro.org, jason@lakedaemon.net, linux-kernel@vger.kernel.org, javier.martinez@collabora.co.uk, benh@kernel.crashing.org, linux@arm.linux.org.uk, ralf@linux-mips.org, david.daney@cavium.com, andrew@lunn.ch, sameo@linux.intel.com, tglx@linutronix.de, linus.walleij@linaro.org In-Reply-To: <1371228049-27080-7-git-send-email-javier.martinez@collabora.co.uk> References: <1371228049-27080-7-git-send-email-javier.martinez@collabora.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] MIPS: octeon: Use irq_get_trigger_type() to get IRQ flags Git-Commit-ID: 5ebf1f29e20de9b37937f808dc2ac8dd15311450 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (terminus.zytor.com [127.0.0.1]); Tue, 25 Jun 2013 02:53:11 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2117 Lines: 48 Commit-ID: 5ebf1f29e20de9b37937f808dc2ac8dd15311450 Gitweb: http://git.kernel.org/tip/5ebf1f29e20de9b37937f808dc2ac8dd15311450 Author: Javier Martinez Canillas AuthorDate: Fri, 14 Jun 2013 18:40:48 +0200 Committer: Thomas Gleixner 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 Acked-by: David Daney Cc: Grant Likely Cc: Linus Walleij Cc: Samuel Ortiz Cc: Jason Cooper Cc: Andrew Lunn Cc: Russell King Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mips@linux-mips.org Link: http://lkml.kernel.org/r/1371228049-27080-7-git-send-email-javier.martinez@collabora.co.uk Signed-off-by: Thomas Gleixner --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/