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,
Linus Walleij <linus.walleij@stericsson.com>,
Wim Van Sebroeck <wim@iguana.be>,
linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org
Subject: [PATCH 51/55] watchdog: irq: Remove IRQF_DISABLED
Date: Thu, 22 Sep 2011 16:59:18 +0800 [thread overview]
Message-ID: <1316681962-8217-52-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: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/watchdog/coh901327_wdt.c | 2 +-
drivers/watchdog/eurotechwdt.c | 2 +-
drivers/watchdog/mpcore_wdt.c | 3 +--
drivers/watchdog/octeon-wdt-main.c | 2 +-
drivers/watchdog/sb_wdog.c | 4 ++--
drivers/watchdog/wdt.c | 2 +-
drivers/watchdog/wdt_pci.c | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 9291506..03f449a 100644
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -429,7 +429,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR);
irq = platform_get_irq(pdev, 0);
- if (request_irq(irq, coh901327_interrupt, IRQF_DISABLED,
+ if (request_irq(irq, coh901327_interrupt, 0,
DRV_NAME " Bark", pdev)) {
ret = -EIO;
goto out_no_irq;
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index f1d1da6..41018d4 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -427,7 +427,7 @@ static int __init eurwdt_init(void)
{
int ret;
- ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL);
+ ret = request_irq(irq, eurwdt_interrupt, 0, "eurwdt", NULL);
if (ret) {
printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
goto out;
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 4dc3102..82ccd36 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -367,8 +367,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto err_misc;
}
- ret = request_irq(wdt->irq, mpcore_wdt_fire, IRQF_DISABLED,
- "mpcore_wdt", wdt);
+ ret = request_irq(wdt->irq, mpcore_wdt_fire, 0, "mpcore_wdt", wdt);
if (ret) {
dev_printk(KERN_ERR, wdt->dev,
"cannot register IRQ%d for watchdog\n", wdt->irq);
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 945ee83..6019087 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -402,7 +402,7 @@ static void octeon_wdt_setup_interrupt(int cpu)
irq = OCTEON_IRQ_WDOG0 + core;
if (request_irq(irq, octeon_wdt_poke_irq,
- IRQF_DISABLED, "octeon_wdt", octeon_wdt_poke_irq))
+ 0, "octeon_wdt", octeon_wdt_poke_irq))
panic("octeon_wdt: Couldn't obtain irq %d", irq);
cpumask_set_cpu(cpu, &irq_enabled_cpus);
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index f31493e..b01a30e 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -300,7 +300,7 @@ static int __init sbwdog_init(void)
* get the resources
*/
- ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+ ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED,
ident.identity, (void *)user_dog);
if (ret) {
printk(KERN_ERR "%s: failed to request irq 1 - %d\n",
@@ -350,7 +350,7 @@ void platform_wd_setup(void)
{
int ret;
- ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+ ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED,
"Kernel Watchdog", IOADDR(A_SCD_WDOG_CFG_0));
if (ret) {
printk(KERN_CRIT
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index bb03e15..d2ef002 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -612,7 +612,7 @@ static int __init wdt_init(void)
goto out;
}
- ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL);
+ ret = request_irq(irq, wdt_interrupt, 0, "wdt501p", NULL);
if (ret) {
printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
goto outreg;
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 172dad6..e0fc3baa 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -643,7 +643,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
irq = dev->irq;
io = pci_resource_start(dev, 2);
- if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED,
+ if (request_irq(irq, wdtpci_interrupt, IRQF_SHARED,
"wdt_pci", &wdtpci_miscdev)) {
printk(KERN_ERR PFX "IRQ %d is not free\n", irq);
goto out_reg;
--
1.7.4.1
next prev parent reply other threads:[~2011-09-22 9:07 UTC|newest]
Thread overview: 62+ 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 ` [PATCH 09/55] m32r: " Yong Zhang
2011-09-22 8:58 ` [PATCH 10/55] m68k: " Yong Zhang
2011-09-22 8:58 ` [PATCH 11/55] microblaze: " 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 ` [PATCH 16/55] score: " Yong Zhang
2011-09-22 8:58 ` [PATCH 17/55] SH: " Yong Zhang
2011-09-22 8:58 ` [PATCH 18/55] sparc: " 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-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 ` [PATCH 29/55] crypto: " Yong Zhang
2011-09-22 8:58 ` [PATCH 30/55] dmaengine: " 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-24 11:53 ` Jean Delvare
2011-10-04 20:59 ` Ben Dooks
2011-09-22 8:59 ` [PATCH 33/55] infiniband: " 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 18:09 ` Roland Dreier
2011-09-22 8:59 ` [PATCH 34/55] ISDN: " 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 ` [PATCH 40/55] dirvers/parisc: " Yong Zhang
2011-09-22 8:59 ` [PATCH 41/55] pcmcia: " 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 ` [PATCH 46/55] rtc: " Yong Zhang
2011-09-22 8:59 ` [PATCH 47/55] spi: " Yong Zhang
2011-09-22 8:59 ` [PATCH 48/55] TTY: " Yong Zhang
2011-09-22 8:59 ` [PATCH 49/55] video: " Yong Zhang
2011-10-04 20:20 ` Florian Tobias Schandinat
2011-09-22 8:59 ` [PATCH 50/55] w1: " Yong Zhang
2011-09-22 8:59 ` Yong Zhang [this message]
2011-09-22 8:59 ` [PATCH 52/55] xen: " 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-52-git-send-email-yong.zhang0@gmail.com \
--to=yong.zhang0@gmail.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=wim@iguana.be \
/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®