From: Ingo Molnar <mingo@elte.hu>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Russell King <rmk@arm.linux.org.uk>,
Andrew Morton <akpm@osdl.org>,
Christoph Hellwig <hch@infradead.org>,
linux-arm-kernel@lists.arm.linux.org.uk
Subject: [patch 45/50] genirq: ARM: Convert plat-omap to generic irq handling
Date: Wed, 17 May 2006 02:18:42 +0200 [thread overview]
Message-ID: <20060517001842.GT12877@elte.hu> (raw)
From: Thomas Gleixner <tglx@linutronix.de>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/gpio.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-genirq.q/arch/arm/plat-omap/dma.c
===================================================================
--- linux-genirq.q.orig/arch/arm/plat-omap/dma.c
+++ linux-genirq.q/arch/arm/plat-omap/dma.c
@@ -24,9 +24,9 @@
#include <linux/spinlock.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <asm/system.h>
-#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/dma.h>
#include <asm/io.h>
Index: linux-genirq.q/arch/arm/plat-omap/gpio.c
===================================================================
--- linux-genirq.q.orig/arch/arm/plat-omap/gpio.c
+++ linux-genirq.q/arch/arm/plat-omap/gpio.c
@@ -737,9 +737,9 @@ static void gpio_irq_handler(unsigned in
unsigned int gpio_irq;
struct gpio_bank *bank;
- desc->chip->ack(irq);
+ desc->handler->ack(irq);
- bank = (struct gpio_bank *) desc->data;
+ bank = get_irq_data(irq);
if (bank->method == METHOD_MPUIO)
isr_reg = bank->base + OMAP_MPUIO_GPIO_INT;
#ifdef CONFIG_ARCH_OMAP15XX
@@ -783,7 +783,7 @@ static void gpio_irq_handler(unsigned in
/* if there is only edge sensitive GPIO pin interrupts
configured, we could unmask GPIO bank interrupt immediately */
if (!level_mask)
- desc->chip->unmask(irq);
+ desc->handler->unmask(irq);
if (!isr)
break;
@@ -809,7 +809,7 @@ static void gpio_irq_handler(unsigned in
handler(s) are executed in order to avoid spurious bank
interrupt */
if (level_mask)
- desc->chip->unmask(irq);
+ desc->handler->unmask(irq);
}
}
reply other threads:[~2006-05-17 0:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060517001842.GT12877@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@osdl.org \
--cc=benh@kernel.crashing.org \
--cc=hch@infradead.org \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®