From: Yong Zhang <yong.zhang0@gmail.com> To: linux-kernel@vger.kernel.org, linux-arch@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/55] m68k: irq: Remove IRQF_DISABLED Date: Thu, 22 Sep 2011 16:58:37 +0800 [thread overview] Message-ID: <1316681962-8217-11-git-send-email-yong.zhang0@gmail.com> (raw) In-Reply-To: <1316681962-8217-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 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
WARNING: multiple messages have this Message-ID (diff)
From: Yong Zhang <yong.zhang0@gmail.com> To: linux-kernel@vger.kernel.org, linux-arch@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@lists.linux-m68k.org Subject: [PATCH 10/55] m68k: irq: Remove IRQF_DISABLED Date: Thu, 22 Sep 2011 16:58:37 +0800 [thread overview] Message-ID: <1316681962-8217-11-git-send-email-yong.zhang0@gmail.com> (raw) In-Reply-To: <1316681962-8217-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 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
next prev parent reply other threads:[~2011-09-22 9:01 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-22 8:58 [PATCH V2 00/55] Tree wide: cleanup IRQF_DISABLED Yong Zhang 2011-09-22 8:58 ` [PATCH 01/55] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED Yong Zhang 2011-09-22 8:58 ` [PATCH 02/55] alpha: irq: Remove IRQF_DISABLED Yong Zhang 2011-09-22 8:58 ` [PATCH 04/55] avr32: " Yong Zhang 2011-09-22 8:58 ` [PATCH 05/55] cris: " Yong Zhang 2011-09-22 8:58 ` [PATCH 06/55] frv: " Yong Zhang 2011-09-22 8:58 ` [PATCH 07/55] h8300: " Yong Zhang 2011-09-22 8:58 ` [PATCH 08/55] ia64: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 09/55] m32r: " Yong Zhang 2011-09-22 8:58 ` [PATCH 10/55] m68k: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang [this message] 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 11/55] microblaze: " Yong Zhang 2011-09-22 8:58 ` [PATCH 12/55] MIPS: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 13/55] mn10300: " Yong Zhang 2011-09-22 8:58 ` [PATCH 14/55] parisc: irq: remove IRQF_DISABLED Yong Zhang 2011-09-22 8:58 ` [PATCH 15/55] powerpc: irq: Remove IRQF_DISABLED Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 16/55] score: " Yong Zhang 2011-09-22 8:58 ` [PATCH 17/55] SH: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 18/55] sparc: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 19/55] um: " Yong Zhang 2011-09-22 10:46 ` Richard Weinberger 2011-09-22 8:58 ` [PATCH 20/55] unicore32: " Yong Zhang 2011-09-22 8:58 ` [PATCH 21/55] x86: irq: " Yong Zhang 2011-09-22 8:58 ` [PATCH 22/55] xtensa: " Yong Zhang 2011-09-22 8:58 ` [PATCH 23/55] clocksource: " Yong Zhang 2011-09-22 8:58 ` [PATCH 24/55] SCSI: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-23 1:35 ` Jack Wang 2011-09-23 1:35 ` Jack Wang 2011-09-23 1:35 ` Jack Wang 2011-09-22 8:58 ` [PATCH 25/55] ata: " Yong Zhang 2011-09-22 8:58 ` [PATCH 26/55] block: " Yong Zhang 2011-09-22 8:58 ` [PATCH 27/55] cdrom: " Yong Zhang 2011-09-22 8:58 ` [PATCH 28/55] driver/char: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 29/55] crypto: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 30/55] dmaengine: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` [PATCH 31/55] EDAC: " Yong Zhang 2011-09-22 8:58 ` [PATCH 32/55] i2c: " Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-22 8:58 ` Yong Zhang 2011-09-24 11:53 ` Jean Delvare 2011-09-24 11:53 ` Jean Delvare 2011-09-24 11:53 ` Jean Delvare 2011-10-04 20:59 ` Ben Dooks 2011-10-04 20:59 ` Ben Dooks 2011-10-04 20:59 ` Ben Dooks 2011-09-22 8:59 ` [PATCH 34/55] ISDN: " Yong Zhang 2011-09-22 8:59 ` [PATCH 35/55] media: " Yong Zhang 2011-09-22 8:59 ` [PATCH 36/55] drivers:misc:irq: " Yong Zhang 2011-09-22 8:59 ` [PATCH 37/55] mmc: irq: " Yong Zhang 2011-09-23 18:55 ` Chris Ball 2011-09-22 8:59 ` [PATCH 38/55] mtd: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` Yong Zhang [not found] ` <1316681962-8217-1-git-send-email-yong.zhang0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2011-09-22 8:59 ` [PATCH 33/55] infiniband: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 16:56 ` Roland Dreier 2011-09-23 1:40 ` Yong Zhang 2011-09-23 1:48 ` Yong Zhang 2011-09-23 1:48 ` Yong Zhang 2011-09-23 18:09 ` Roland Dreier 2011-09-22 8:59 ` [PATCH 39/55] net: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 40/55] dirvers/parisc: " Yong Zhang 2011-09-22 8:59 ` [PATCH 41/55] pcmcia: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 42/55] sony-laptop:irq: " Yong Zhang 2011-09-22 8:59 ` [PATCH 43/55] PNP: irq: " Yong Zhang 2011-09-22 8:59 ` [PATCH 44/55] power_supply:irq: " Yong Zhang 2011-11-25 20:35 ` Anton Vorontsov 2011-09-22 8:59 ` [PATCH 45/55] powerpc/ps3: irq: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 46/55] rtc: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 47/55] spi: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 48/55] TTY: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 49/55] video: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-10-04 20:20 ` Florian Tobias Schandinat 2011-10-04 20:20 ` Florian Tobias Schandinat 2011-10-04 20:20 ` Florian Tobias Schandinat 2011-09-22 8:59 ` [PATCH 50/55] w1: " Yong Zhang 2011-09-22 8:59 ` [PATCH 51/55] watchdog: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 52/55] xen: " Yong Zhang 2011-09-22 8:59 ` [PATCH 53/55] sound: " Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` Yong Zhang 2011-09-22 8:59 ` [PATCH 54/55] Documentation: irq: Change documents related to IRQF_DISABLED Yong Zhang 2011-09-22 8:59 ` [PATCH 55/55] genirq: Remove IRQF_DISABLED 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=1316681962-8217-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.