Commit 86b5912880453532440358b1486410ad49ef7672
Committed by
Wim Van Sebroeck
1 parent
47bfd05813
Exists in
master
and in
38 other branches
watchdog: irq: Remove IRQF_DISABLED
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>
Showing 6 changed files with 7 additions and 8 deletions Side-by-side Diff
drivers/watchdog/coh901327_wdt.c
... | ... | @@ -429,7 +429,7 @@ |
429 | 429 | writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR); |
430 | 430 | |
431 | 431 | irq = platform_get_irq(pdev, 0); |
432 | - if (request_irq(irq, coh901327_interrupt, IRQF_DISABLED, | |
432 | + if (request_irq(irq, coh901327_interrupt, 0, | |
433 | 433 | DRV_NAME " Bark", pdev)) { |
434 | 434 | ret = -EIO; |
435 | 435 | goto out_no_irq; |
drivers/watchdog/eurotechwdt.c
... | ... | @@ -427,7 +427,7 @@ |
427 | 427 | { |
428 | 428 | int ret; |
429 | 429 | |
430 | - ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL); | |
430 | + ret = request_irq(irq, eurwdt_interrupt, 0, "eurwdt", NULL); | |
431 | 431 | if (ret) { |
432 | 432 | printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq); |
433 | 433 | goto out; |
drivers/watchdog/mpcore_wdt.c
... | ... | @@ -367,8 +367,7 @@ |
367 | 367 | goto err_misc; |
368 | 368 | } |
369 | 369 | |
370 | - ret = request_irq(wdt->irq, mpcore_wdt_fire, IRQF_DISABLED, | |
371 | - "mpcore_wdt", wdt); | |
370 | + ret = request_irq(wdt->irq, mpcore_wdt_fire, 0, "mpcore_wdt", wdt); | |
372 | 371 | if (ret) { |
373 | 372 | dev_printk(KERN_ERR, wdt->dev, |
374 | 373 | "cannot register IRQ%d for watchdog\n", wdt->irq); |
drivers/watchdog/sb_wdog.c
... | ... | @@ -300,7 +300,7 @@ |
300 | 300 | * get the resources |
301 | 301 | */ |
302 | 302 | |
303 | - ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED, | |
303 | + ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED, | |
304 | 304 | ident.identity, (void *)user_dog); |
305 | 305 | if (ret) { |
306 | 306 | printk(KERN_ERR "%s: failed to request irq 1 - %d\n", |
... | ... | @@ -350,7 +350,7 @@ |
350 | 350 | { |
351 | 351 | int ret; |
352 | 352 | |
353 | - ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED, | |
353 | + ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED, | |
354 | 354 | "Kernel Watchdog", IOADDR(A_SCD_WDOG_CFG_0)); |
355 | 355 | if (ret) { |
356 | 356 | printk(KERN_CRIT |
drivers/watchdog/wdt.c
... | ... | @@ -612,7 +612,7 @@ |
612 | 612 | goto out; |
613 | 613 | } |
614 | 614 | |
615 | - ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL); | |
615 | + ret = request_irq(irq, wdt_interrupt, 0, "wdt501p", NULL); | |
616 | 616 | if (ret) { |
617 | 617 | printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq); |
618 | 618 | goto outreg; |
drivers/watchdog/wdt_pci.c
... | ... | @@ -643,7 +643,7 @@ |
643 | 643 | irq = dev->irq; |
644 | 644 | io = pci_resource_start(dev, 2); |
645 | 645 | |
646 | - if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED, | |
646 | + if (request_irq(irq, wdtpci_interrupt, IRQF_SHARED, | |
647 | 647 | "wdt_pci", &wdtpci_miscdev)) { |
648 | 648 | printk(KERN_ERR PFX "IRQ %d is not free\n", irq); |
649 | 649 | goto out_reg; |