提交 86b59128 编写于 作者: Y Yong Zhang 提交者: Wim Van Sebroeck

watchdog: irq: Remove IRQF_DISABLED

This flag is a NOOP and can be removed now.
Signed-off-by: NYong Zhang <yong.zhang0@gmail.com>
Acked-by: NWolfram Sang <w.sang@pengutronix.de>
Acked-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
上级 47bfd058
...@@ -429,7 +429,7 @@ static int __init coh901327_probe(struct platform_device *pdev) ...@@ -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;
......
...@@ -427,7 +427,7 @@ static int __init eurwdt_init(void) ...@@ -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;
......
...@@ -367,8 +367,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev) ...@@ -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);
......
...@@ -300,7 +300,7 @@ static int __init sbwdog_init(void) ...@@ -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) ...@@ -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
......
...@@ -612,7 +612,7 @@ static int __init wdt_init(void) ...@@ -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;
......
...@@ -643,7 +643,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册