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 42/50] genirq: ARM: Convert sa1100 to generic irq handling
Date: Wed, 17 May 2006 02:18:27 +0200 [thread overview]
Message-ID: <20060517001827.GQ12877@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/mach-sa1100/cerf.c | 1 +
arch/arm/mach-sa1100/h3600.c | 2 +-
arch/arm/mach-sa1100/irq.c | 3 ++-
arch/arm/mach-sa1100/neponset.c | 6 +++---
arch/arm/mach-sa1100/pleb.c | 1 +
arch/arm/mach-sa1100/time.c | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
Index: linux-genirq.q/arch/arm/mach-sa1100/cerf.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/cerf.c
+++ linux-genirq.q/arch/arm/mach-sa1100/cerf.c
@@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/platform_device.h>
+#include <linux/irq.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
Index: linux-genirq.q/arch/arm/mach-sa1100/h3600.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/h3600.c
+++ linux-genirq.q/arch/arm/mach-sa1100/h3600.c
@@ -836,7 +836,7 @@ static void __init h3800_init_irq(void)
}
#endif
set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);
- set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, &h3800_IRQ_demux);
+ set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
}
Index: linux-genirq.q/arch/arm/mach-sa1100/irq.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/irq.c
+++ linux-genirq.q/arch/arm/mach-sa1100/irq.c
@@ -11,12 +11,13 @@
*/
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/ioport.h>
#include <linux/ptrace.h>
#include <linux/sysdev.h>
#include <asm/hardware.h>
-#include <asm/irq.h>
#include <asm/mach/irq.h>
#include "generic.h"
Index: linux-genirq.q/arch/arm/mach-sa1100/neponset.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/neponset.c
+++ linux-genirq.q/arch/arm/mach-sa1100/neponset.c
@@ -39,7 +39,7 @@ neponset_irq_handler(unsigned int irq, s
/*
* Acknowledge the parent IRQ.
*/
- desc->chip->ack(irq);
+ desc->handler->ack(irq);
/*
* Read the interrupt reason register. Let's have all
@@ -57,7 +57,7 @@ neponset_irq_handler(unsigned int irq, s
* recheck the register for any pending IRQs.
*/
if (irr & (IRR_ETHERNET | IRR_USAR)) {
- desc->chip->mask(irq);
+ desc->handler->mask(irq);
if (irr & IRR_ETHERNET) {
d = irq_desc + IRQ_NEPONSET_SMC9196;
@@ -69,7 +69,7 @@ neponset_irq_handler(unsigned int irq, s
desc_handle_irq(IRQ_NEPONSET_USAR, d, regs);
}
- desc->chip->unmask(irq);
+ desc->handler->unmask(irq);
}
if (irr & IRR_SA1111) {
Index: linux-genirq.q/arch/arm/mach-sa1100/pleb.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/pleb.c
+++ linux-genirq.q/arch/arm/mach-sa1100/pleb.c
@@ -7,6 +7,7 @@
#include <linux/tty.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
+#include <linux/irq.h>
#include <linux/mtd/partitions.h>
Index: linux-genirq.q/arch/arm/mach-sa1100/time.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-sa1100/time.c
+++ linux-genirq.q/arch/arm/mach-sa1100/time.c
@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/timex.h>
#include <linux/signal.h>
reply other threads:[~2006-05-17 0:21 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=20060517001827.GQ12877@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®