mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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>
This commit is contained in:
parent
47bfd05813
commit
86b5912880
6 changed files with 7 additions and 8 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue