lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

watchdog: irq: Remove IRQF_DISABLED

Browse Source 
This flag is a NOOP and can be removed now.

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>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Yong Zhang
2011-09-07 16:10:55 +08:00
committed by Wim Van Sebroeck
parent 47bfd05813
commit 86b5912880
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/coh901327_wdt.c
View File

@@ -429,7 +429,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR); writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR);
irq = platform_get_irq(pdev, 0); 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)) { DRV_NAME " Bark", pdev)) {
ret = -EIO; ret = -EIO;
goto out_no_irq; goto out_no_irq;

2
drivers/watchdog/eurotechwdt.c
View File

@@ -427,7 +427,7 @@ static int __init eurwdt_init(void)
{ {
int ret; int ret;
ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL); ret = request_irq(irq, eurwdt_interrupt, 0, "eurwdt", NULL);
if (ret) { if (ret) {
printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq); printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
goto out; goto out;

3
drivers/watchdog/mpcore_wdt.c
View File

@@ -367,8 +367,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto err_misc; goto err_misc;
} }
ret = request_irq(wdt->irq, mpcore_wdt_fire, IRQF_DISABLED, ret = request_irq(wdt->irq, mpcore_wdt_fire, 0, "mpcore_wdt", wdt);
"mpcore_wdt", wdt);
if (ret) { if (ret) {
dev_printk(KERN_ERR, wdt->dev, dev_printk(KERN_ERR, wdt->dev,
"cannot register IRQ%d for watchdog\n", wdt->irq); "cannot register IRQ%d for watchdog\n", wdt->irq);

4
drivers/watchdog/sb_wdog.c
View File

@@ -300,7 +300,7 @@ static int __init sbwdog_init(void)
* get the resources * 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); ident.identity, (void *)user_dog);
if (ret) { if (ret) {
printk(KERN_ERR "%s: failed to request irq 1 - %d\n", printk(KERN_ERR "%s: failed to request irq 1 - %d\n",
@@ -350,7 +350,7 @@ void platform_wd_setup(void)
{ {
int ret; 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)); "Kernel Watchdog", IOADDR(A_SCD_WDOG_CFG_0));
if (ret) { if (ret) {
printk(KERN_CRIT printk(KERN_CRIT

2
drivers/watchdog/wdt.c
View File

@@ -612,7 +612,7 @@ static int __init wdt_init(void)
goto out; goto out;
} }
ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL); ret = request_irq(irq, wdt_interrupt, 0, "wdt501p", NULL);
if (ret) { if (ret) {
printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq); printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
goto outreg; goto outreg;

2
drivers/watchdog/wdt_pci.c
View File

@@ -643,7 +643,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
irq = dev->irq; irq = dev->irq;
io = pci_resource_start(dev, 2); 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)) { "wdt_pci", &wdtpci_miscdev)) {
printk(KERN_ERR PFX "IRQ %d is not free\n", irq); printk(KERN_ERR PFX "IRQ %d is not free\n", irq);
goto out_reg; goto out_reg;