From: Yong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, Geert Uytterhoeven <geert@linux-m68k.org>,
Sam Creasey <sammy@sammy.net>,
linux-m68k@vger.kernel.org
Subject: [PATCH 10/49] m68k: irq: Remove IRQF_DISABLED
Date: Sat, 22 Oct 2011 17:56:22 +0800 [thread overview]
Message-ID: <1319277421-9203-11-git-send-email-yong.zhang0@gmail.com> (raw)
In-Reply-To: <1319277421-9203-1-git-send-email-yong.zhang0@gmail.com>
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m68k/include/asm/floppy.h | 2 +-
arch/m68k/include/asm/irq.h | 4 ++--
arch/m68k/include/asm/sun3xflop.h | 2 +-
arch/m68k/platform/68328/timers.c | 2 +-
arch/m68k/platform/68360/config.c | 2 +-
arch/m68k/platform/coldfire/pit.c | 2 +-
arch/m68k/platform/coldfire/sltimers.c | 4 ++--
arch/m68k/platform/coldfire/timers.c | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h
index 697d503..47365b1 100644
--- a/arch/m68k/include/asm/floppy.h
+++ b/arch/m68k/include/asm/floppy.h
@@ -85,7 +85,7 @@ static int fd_request_irq(void)
{
if(MACH_IS_Q40)
return request_irq(FLOPPY_IRQ, floppy_hardint,
- IRQF_DISABLED, "floppy", floppy_hardint);
+ 0, "floppy", floppy_hardint);
else if(MACH_IS_SUN3X)
return sun3xflop_request_irq();
return -ENXIO;
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index 69ed0d7..35de598 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -60,8 +60,8 @@ struct pt_regs;
/*
* various flags for request_irq() - the Amiga now uses the standard
- * mechanism like all other architectures - IRQF_DISABLED and
- * IRQF_SHARED are your friends.
+ * mechanism like all other architectures - IRQF_SHARED etc.
+ * are your friends.
*/
#ifndef MACH_AMIGA_ONLY
#define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */
diff --git a/arch/m68k/include/asm/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h
index 32c45f8..80f8f9f 100644
--- a/arch/m68k/include/asm/sun3xflop.h
+++ b/arch/m68k/include/asm/sun3xflop.h
@@ -208,7 +208,7 @@ static int sun3xflop_request_irq(void)
if(!once) {
once = 1;
error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
- IRQF_DISABLED, "floppy", NULL);
+ 0, "floppy", NULL);
return ((error == 0) ? 0 : -1);
} else return 0;
}
diff --git a/arch/m68k/platform/68328/timers.c b/arch/m68k/platform/68328/timers.c
index 309f725..d135b26 100644
--- a/arch/m68k/platform/68328/timers.c
+++ b/arch/m68k/platform/68328/timers.c
@@ -69,7 +69,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68328_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = hw_tick,
};
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c
index 9dd5bca..c67f1c3 100644
--- a/arch/m68k/platform/68360/config.c
+++ b/arch/m68k/platform/68360/config.c
@@ -58,7 +58,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68360_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = hw_tick,
};
diff --git a/arch/m68k/platform/coldfire/pit.c b/arch/m68k/platform/coldfire/pit.c
index c2b9809..c69b71a 100644
--- a/arch/m68k/platform/coldfire/pit.c
+++ b/arch/m68k/platform/coldfire/pit.c
@@ -118,7 +118,7 @@ static irqreturn_t pit_tick(int irq, void *dummy)
static struct irqaction pit_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = pit_tick,
};
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 6a85daf..2168dda 100644
--- a/arch/m68k/platform/coldfire/sltimers.c
+++ b/arch/m68k/platform/coldfire/sltimers.c
@@ -51,7 +51,7 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)
static struct irqaction mcfslt_profile_irq = {
.name = "profile timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = mcfslt_profile_tick,
};
@@ -91,7 +91,7 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)
static struct irqaction mcfslt_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = mcfslt_tick,
};
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c
index 60242f6..687a38f 100644
--- a/arch/m68k/platform/coldfire/timers.c
+++ b/arch/m68k/platform/coldfire/timers.c
@@ -62,7 +62,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)
static struct irqaction mcftmr_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = mcftmr_tick,
};
@@ -150,7 +150,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)
static struct irqaction coldfire_profile_irq = {
.name = "profile timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = coldfire_profile_tick,
};
--
1.7.1
next prev parent reply other threads:[~2011-10-22 10:02 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-22 9:56 [PATCH V3 00/49] Tree wide: cleanup IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 01/49] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED Yong Zhang
2011-10-22 9:56 ` [PATCH 02/49] alpha: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 04/49] avr32: " Yong Zhang
2011-10-22 9:56 ` [PATCH 05/49] cris: " Yong Zhang
2011-10-22 9:56 ` [PATCH 06/49] frv: " Yong Zhang
2011-10-22 9:56 ` [PATCH 07/49] h8300: " Yong Zhang
2011-10-22 9:56 ` [PATCH 08/49] ia64: " Yong Zhang
2011-10-22 9:56 ` [PATCH 09/49] m32r: " Yong Zhang
2011-10-22 9:56 ` Yong Zhang [this message]
2011-10-22 9:56 ` [PATCH 11/49] microblaze: " Yong Zhang
2011-10-22 9:56 ` [PATCH 12/49] MIPS: " Yong Zhang
2011-11-04 12:21 ` Ralf Baechle
2011-11-07 2:10 ` Yong Zhang
2011-11-07 2:49 ` Stephen Rothwell
2011-11-07 3:06 ` Yong Zhang
2011-10-22 9:56 ` [PATCH 13/49] mn10300: " Yong Zhang
2011-10-22 9:56 ` [PATCH 14/49] parisc: irq: remove IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 15/49] powerpc: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-23 1:57 ` Geoff Levand
2011-10-22 9:56 ` [PATCH 16/49] SH: " Yong Zhang
2011-10-28 6:17 ` Paul Mundt
2011-10-22 9:56 ` [PATCH 17/49] sparc: " Yong Zhang
2011-10-22 9:56 ` [PATCH 18/49] um: " Yong Zhang
2011-10-28 10:54 ` Richard Weinberger
2011-10-28 11:51 ` Yong Zhang
2011-10-22 9:56 ` [PATCH 19/49] unicore32: " Yong Zhang
2011-10-22 9:56 ` [PATCH 20/49] x86: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 21/49] xtensa: " Yong Zhang
2011-10-22 9:56 ` [PATCH 22/49] score: " Yong Zhang
2011-10-22 9:56 ` [PATCH 23/49] clocksource: " Yong Zhang
2011-10-22 9:56 ` [PATCH 24/49] SCSI: " Yong Zhang
2011-10-22 9:56 ` [PATCH 25/49] block: " Yong Zhang
2011-10-22 9:56 ` [PATCH 26/49] cdrom: " Yong Zhang
2011-10-22 9:56 ` [PATCH 27/49] driver/char: " Yong Zhang
2011-10-22 9:56 ` [PATCH 28/49] crypto: " Yong Zhang
2011-10-22 9:56 ` [PATCH 29/49] dmaengine: " Yong Zhang
2011-10-22 9:56 ` [PATCH 30/49] EDAC: " Yong Zhang
2011-10-22 9:56 ` [PATCH 31/49] ISDN: " Yong Zhang
2011-10-22 9:56 ` [PATCH 32/49] media: " Yong Zhang
2011-10-22 9:56 ` [PATCH 33/49] drivers:misc:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 34/49] mtd: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 35/49] net: " Yong Zhang
2011-10-22 9:56 ` [PATCH 36/49] dirvers/parisc: " Yong Zhang
2011-10-22 9:56 ` [PATCH 37/49] pcmcia: " Yong Zhang
2012-02-05 21:11 ` Dominik Brodowski
2011-10-22 9:56 ` [PATCH 38/49] sony-laptop:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 39/49] PNP: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 40/49] power_supply:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 41/49] powerpc/ps3: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 42/49] rtc: " Yong Zhang
2011-10-22 9:56 ` [PATCH 43/49] spi: " Yong Zhang
2011-10-24 12:14 ` Grant Likely
2011-10-22 9:56 ` [PATCH 44/49] w1: " Yong Zhang
2011-10-22 9:56 ` [PATCH 45/49] watchdog: " Yong Zhang
2011-10-22 9:56 ` [PATCH 46/49] xen: " Yong Zhang
2011-10-22 9:56 ` [PATCH 47/49] Documentation: irq: Change documents related to IRQF_DISABLED Yong Zhang
2011-10-22 9:57 ` [PATCH 48/49] USB: pxa168: xls: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-22 13:16 ` Tanmay Upadhyay
2011-10-22 9:57 ` [PATCH 49/49] genirq: " Yong Zhang
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=1319277421-9203-11-git-send-email-yong.zhang0@gmail.com \
--to=yong.zhang0@gmail.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=sammy@sammy.net \
--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;
as well as URLs for NNTP newsgroup(s).