linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yong Zhang <yong.zhang0@gmail.com>
To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, yong.zhang0@gmail.com,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Sam Creasey <sammy@sammy.net>, Greg Ungerer <gerg@uclinux.org>,
	Lucas De Marchi <lucas.demarchi@profusion.mobi>,
	linux-m68k@vger.kernel.org
Subject: [PATCH 10/57] m68k: irq: Remove IRQF_DISABLED
Date: Wed, 21 Sep 2011 17:28:11 +0800	[thread overview]
Message-ID: <1316597339-29861-11-git-send-email-yong.zhang0@gmail.com> (raw)
In-Reply-To: <1316597339-29861-1-git-send-email-yong.zhang0@gmail.com>

Since commit [c58543c8: 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 69ed0d74..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.4.1


  parent reply	other threads:[~2011-09-21  9:30 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-21  9:28 [PATCH V1 00/57] Tree wide: cleanup IRQF_DISABLED Yong Zhang
2011-09-21  9:28 ` [PATCH 01/57] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED Yong Zhang
2011-09-21  9:28 ` [PATCH 02/57] alpha: irq: Remove IRQF_DISABLED Yong Zhang
2011-09-21  9:28 ` [PATCH 04/57] avr32: " Yong Zhang
2011-09-21  9:28 ` [PATCH 05/57] cris: " Yong Zhang
2011-09-21  9:28 ` [PATCH 06/57] frv: " Yong Zhang
2011-09-21  9:28 ` [PATCH 07/57] h8300: " Yong Zhang
2011-09-21  9:28 ` [PATCH 08/57] ia64: " Yong Zhang
2011-09-21  9:28 ` [PATCH 09/57] m32r: " Yong Zhang
2011-09-21  9:28 ` Yong Zhang [this message]
2011-09-21  9:28 ` [PATCH 11/57] microblaze: " Yong Zhang
2011-09-21  9:28 ` [PATCH 13/57] mn10300: " Yong Zhang
2011-09-21  9:28 ` [PATCH 14/57] parisc: irq: remove IRQF_DISABLED Yong Zhang
2011-09-21  9:28 ` [PATCH 15/57] powerpc: irq: Remove IRQF_DISABLED Yong Zhang
2011-09-21  9:28 ` [PATCH 16/57] score: " Yong Zhang
2011-09-21  9:28 ` [PATCH 17/57] SH: " Yong Zhang
2011-09-21  9:28 ` [PATCH 18/57] sparc: " Yong Zhang
2011-09-21 17:40   ` David Miller
2011-09-21  9:28 ` [PATCH 19/57] um: " Yong Zhang
2011-09-21  9:28 ` [PATCH 20/57] unicore32: " Yong Zhang
2011-09-21  9:28 ` [PATCH 21/57] x86: irq: " Yong Zhang
2011-09-21  9:28 ` [PATCH 22/57] xtensa: " Yong Zhang
2011-09-21  9:28 ` [PATCH 23/57] clocksource: " Yong Zhang
2011-09-21  9:28 ` [PATCH 24/57] SCSI: " Yong Zhang
2011-09-21  9:28 ` [PATCH 25/57] ata: " Yong Zhang
2011-09-21 10:35   ` Wolfram Sang
2011-09-21  9:28 ` [PATCH 26/57] block: " Yong Zhang
2011-09-21  9:28 ` [PATCH 27/57] cdrom: " Yong Zhang
2011-09-21  9:28 ` [PATCH 28/57] driver/char: " Yong Zhang
2011-09-21  9:28 ` [PATCH 29/57] crypto: " Yong Zhang
2011-09-21  9:28 ` [PATCH 30/57] dmaengine: " Yong Zhang
2011-09-21  9:28 ` [PATCH 31/57] EDAC: " Yong Zhang
2011-09-21  9:28 ` [PATCH 32/57] i2c: " Yong Zhang
2011-09-21  9:28 ` [PATCH 33/57] infiniband: " Yong Zhang
2011-09-21  9:28 ` [PATCH 34/57] ISDN: " Yong Zhang
2011-09-21  9:28 ` [PATCH 36/57] drivers:misc:irq: " Yong Zhang
2011-09-21  9:28 ` [PATCH 37/57] mmc: irq: " Yong Zhang
2011-09-21 10:16   ` Guennadi Liakhovetski
2011-09-22 14:50   ` Kadiyala, Kishore
2011-09-21  9:28 ` [PATCH 38/57] mtd: " Yong Zhang
2011-09-21  9:28 ` [PATCH 40/57] dirvers/parisc: " Yong Zhang
2011-09-21 10:07   ` James Bottomley
2011-09-21 12:07     ` Yong Zhang
2011-09-21  9:28 ` [PATCH 41/57] pcmcia: " Yong Zhang
2011-09-21  9:28 ` [PATCH 42/57] sony-laptop:irq: " Yong Zhang
2011-09-21  9:28 ` [PATCH 43/57] PNP: irq: " Yong Zhang
2011-09-21 20:20   ` Bjorn Helgaas
2011-09-21  9:28 ` [PATCH 44/57] power_supply:irq: " Yong Zhang
2011-09-21  9:28 ` [PATCH 45/57] powerpc/ps3: irq: " Yong Zhang
2011-09-21  9:28 ` [PATCH 46/57] rtc: " Yong Zhang
2011-09-21  9:52   ` Wan ZongShun
2011-09-21 10:31   ` [rtc-linux] " Wolfram Sang
2011-09-21  9:28 ` [PATCH 47/57] spi: " Yong Zhang
2011-09-21  9:28 ` [PATCH 48/57] TTY: " Yong Zhang
2011-09-21  9:28 ` [PATCH 49/57] video: " Yong Zhang
2011-09-21 20:22   ` David Brown
2011-09-21  9:28 ` [PATCH 50/57] w1: " Yong Zhang
2011-09-21 10:06   ` Evgeniy Polyakov
2011-09-21  9:28 ` [PATCH 51/57] watchdog: " Yong Zhang
2011-09-21  9:28 ` [PATCH 52/57] xen: " Yong Zhang
2011-09-21  9:28 ` [PATCH 54/57] Documentation: irq: Change documents related to IRQF_DISABLED Yong Zhang
2011-09-28 22:33   ` Bjorn Helgaas
2011-10-08  2:34     ` Yong Zhang
2011-09-21  9:28 ` [PATCH 55/57] hexagon: irq: Remove IRQF_DISABLED Yong Zhang
2011-09-21 15:35   ` Richard Kuo
2011-09-22  8:08     ` Yong Zhang
2011-09-21  9:28 ` [PATCH 56/57] hwmon: " Yong Zhang
2011-09-21 19:07   ` Guenter Roeck
2011-09-21  9:28 ` [PATCH 57/57] genirq: " Yong Zhang
2011-09-21 12:27 ` [PATCH V1 00/57] Tree wide: cleanup IRQF_DISABLED Yong Zhang
     [not found] ` <1316597339-29861-40-git-send-email-yong.zhang0@gmail.com>
2011-09-21 17:40   ` [PATCH 39/57] net: irq: Remove IRQF_DISABLED David Miller

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=1316597339-29861-11-git-send-email-yong.zhang0@gmail.com \
    --to=yong.zhang0@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=gerg@uclinux.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=lucas.demarchi@profusion.mobi \
    --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).