diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 04:59:16 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-03 11:52:22 -0400 |
commit | f8798ccbefc0e4ef7438c080b7ba0410738c8cfa (patch) | |
tree | 9133440693c02314f1f6f95629b3594ce24ad0f8 /drivers/video | |
parent | 261e767628bb5971b9032439818237cc8511ea94 (diff) |
video: irq: Remove IRQF_DISABLED
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: David Brown <davidb@codeaurora.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/au1200fb.c | 2 | ||||
-rw-r--r-- | drivers/video/bf54x-lq043fb.c | 2 | ||||
-rw-r--r-- | drivers/video/bfin-lq035q1-fb.c | 2 | ||||
-rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 2 | ||||
-rw-r--r-- | drivers/video/bfin_adv7393fb.c | 2 | ||||
-rw-r--r-- | drivers/video/mb862xx/mb862xxfbdrv.c | 4 | ||||
-rw-r--r-- | drivers/video/msm/mddi.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mdp.c | 2 | ||||
-rw-r--r-- | drivers/video/nuc900fb.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 2 | ||||
-rw-r--r-- | drivers/video/ps3fb.c | 2 | ||||
-rw-r--r-- | drivers/video/pxa3xx-gcu.c | 2 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 | ||||
-rw-r--r-- | drivers/video/s3c2410fb.c | 2 | ||||
-rw-r--r-- | drivers/video/sa1100fb.c | 3 | ||||
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 2 | ||||
-rw-r--r-- | drivers/video/tmiofb.c | 2 | ||||
-rw-r--r-- | drivers/video/vt8500lcdfb.c | 2 |
18 files changed, 19 insertions, 20 deletions
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index a19a40effd88..72005598040f 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
@@ -1673,7 +1673,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) | |||
1673 | /* Now hook interrupt too */ | 1673 | /* Now hook interrupt too */ |
1674 | irq = platform_get_irq(dev, 0); | 1674 | irq = platform_get_irq(dev, 0); |
1675 | ret = request_irq(irq, au1200fb_handle_irq, | 1675 | ret = request_irq(irq, au1200fb_handle_irq, |
1676 | IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev); | 1676 | IRQF_SHARED, "lcd", (void *)dev); |
1677 | if (ret) { | 1677 | if (ret) { |
1678 | print_err("fail to request interrupt line %d (err: %d)", | 1678 | print_err("fail to request interrupt line %d (err: %d)", |
1679 | irq, ret); | 1679 | irq, ret); |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 2464b910b590..56720fb476b3 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -633,7 +633,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) | |||
633 | goto out7; | 633 | goto out7; |
634 | } | 634 | } |
635 | 635 | ||
636 | if (request_irq(info->irq, bfin_bf54x_irq_error, IRQF_DISABLED, | 636 | if (request_irq(info->irq, bfin_bf54x_irq_error, 0, |
637 | "PPI ERROR", info) < 0) { | 637 | "PPI ERROR", info) < 0) { |
638 | printk(KERN_ERR DRIVER_NAME | 638 | printk(KERN_ERR DRIVER_NAME |
639 | ": unable to request PPI ERROR IRQ\n"); | 639 | ": unable to request PPI ERROR IRQ\n"); |
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c index 23b6c4b62c78..c633068372c9 100644 --- a/drivers/video/bfin-lq035q1-fb.c +++ b/drivers/video/bfin-lq035q1-fb.c | |||
@@ -695,7 +695,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev) | |||
695 | goto out7; | 695 | goto out7; |
696 | } | 696 | } |
697 | 697 | ||
698 | ret = request_irq(info->irq, bfin_lq035q1_irq_error, IRQF_DISABLED, | 698 | ret = request_irq(info->irq, bfin_lq035q1_irq_error, 0, |
699 | DRIVER_NAME" PPI ERROR", info); | 699 | DRIVER_NAME" PPI ERROR", info); |
700 | if (ret < 0) { | 700 | if (ret < 0) { |
701 | dev_err(&pdev->dev, "unable to request PPI ERROR IRQ\n"); | 701 | dev_err(&pdev->dev, "unable to request PPI ERROR IRQ\n"); |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index d8de29f0dd8d..d5e126759612 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -529,7 +529,7 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) | |||
529 | goto out7; | 529 | goto out7; |
530 | } | 530 | } |
531 | 531 | ||
532 | ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED, | 532 | ret = request_irq(info->irq, bfin_t350mcqb_irq_error, 0, |
533 | "PPI ERROR", info); | 533 | "PPI ERROR", info); |
534 | if (ret < 0) { | 534 | if (ret < 0) { |
535 | printk(KERN_ERR DRIVER_NAME | 535 | printk(KERN_ERR DRIVER_NAME |
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c index 8486f541156b..811dd7f6aa41 100644 --- a/drivers/video/bfin_adv7393fb.c +++ b/drivers/video/bfin_adv7393fb.c | |||
@@ -481,7 +481,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client, | |||
481 | goto out_4; | 481 | goto out_4; |
482 | } | 482 | } |
483 | 483 | ||
484 | if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, IRQF_DISABLED, | 484 | if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, 0, |
485 | "PPI ERROR", fbdev) < 0) { | 485 | "PPI ERROR", fbdev) < 0) { |
486 | dev_err(&client->dev, "unable to request PPI ERROR IRQ\n"); | 486 | dev_err(&client->dev, "unable to request PPI ERROR IRQ\n"); |
487 | ret = -EFAULT; | 487 | ret = -EFAULT; |
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c index 7a1f2773cf38..c16ff1d62e91 100644 --- a/drivers/video/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/mb862xx/mb862xxfbdrv.c | |||
@@ -737,7 +737,7 @@ static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev) | |||
737 | if (mb862xx_gdc_init(par)) | 737 | if (mb862xx_gdc_init(par)) |
738 | goto io_unmap; | 738 | goto io_unmap; |
739 | 739 | ||
740 | if (request_irq(par->irq, mb862xx_intr, IRQF_DISABLED, | 740 | if (request_irq(par->irq, mb862xx_intr, 0, |
741 | DRV_NAME, (void *)par)) { | 741 | DRV_NAME, (void *)par)) { |
742 | dev_err(dev, "Cannot request irq\n"); | 742 | dev_err(dev, "Cannot request irq\n"); |
743 | goto io_unmap; | 743 | goto io_unmap; |
@@ -1073,7 +1073,7 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, | |||
1073 | if (mb862xx_pci_gdc_init(par)) | 1073 | if (mb862xx_pci_gdc_init(par)) |
1074 | goto io_unmap; | 1074 | goto io_unmap; |
1075 | 1075 | ||
1076 | if (request_irq(par->irq, mb862xx_intr, IRQF_DISABLED | IRQF_SHARED, | 1076 | if (request_irq(par->irq, mb862xx_intr, IRQF_SHARED, |
1077 | DRV_NAME, (void *)par)) { | 1077 | DRV_NAME, (void *)par)) { |
1078 | dev_err(dev, "Cannot request irq\n"); | 1078 | dev_err(dev, "Cannot request irq\n"); |
1079 | goto io_unmap; | 1079 | goto io_unmap; |
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index 178b0720bd79..4527cbf0a4ec 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
@@ -715,7 +715,7 @@ static int __devinit mddi_probe(struct platform_device *pdev) | |||
715 | 715 | ||
716 | mddi->int_enable = 0; | 716 | mddi->int_enable = 0; |
717 | mddi_writel(mddi->int_enable, INTEN); | 717 | mddi_writel(mddi->int_enable, INTEN); |
718 | ret = request_irq(mddi->irq, mddi_isr, IRQF_DISABLED, "mddi", | 718 | ret = request_irq(mddi->irq, mddi_isr, 0, "mddi", |
719 | &mddi->client_data); | 719 | &mddi->client_data); |
720 | if (ret) { | 720 | if (ret) { |
721 | printk(KERN_ERR "mddi: failed to request enable irq!\n"); | 721 | printk(KERN_ERR "mddi: failed to request enable irq!\n"); |
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index 01fa660764b4..b9344772bac9 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c | |||
@@ -425,7 +425,7 @@ int mdp_probe(struct platform_device *pdev) | |||
425 | goto error_get_clk; | 425 | goto error_get_clk; |
426 | } | 426 | } |
427 | 427 | ||
428 | ret = request_irq(mdp->irq, mdp_isr, IRQF_DISABLED, "msm_mdp", mdp); | 428 | ret = request_irq(mdp->irq, mdp_isr, 0, "msm_mdp", mdp); |
429 | if (ret) | 429 | if (ret) |
430 | goto error_request_irq; | 430 | goto error_request_irq; |
431 | disable_irq(mdp->irq); | 431 | disable_irq(mdp->irq); |
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c index 37dd8507e12b..d1fbbd888cf4 100644 --- a/drivers/video/nuc900fb.c +++ b/drivers/video/nuc900fb.c | |||
@@ -587,7 +587,7 @@ static int __devinit nuc900fb_probe(struct platform_device *pdev) | |||
587 | fbinfo->flags = FBINFO_FLAG_DEFAULT; | 587 | fbinfo->flags = FBINFO_FLAG_DEFAULT; |
588 | fbinfo->pseudo_palette = &fbi->pseudo_pal; | 588 | fbinfo->pseudo_palette = &fbi->pseudo_pal; |
589 | 589 | ||
590 | ret = request_irq(irq, nuc900fb_irqhandler, IRQF_DISABLED, | 590 | ret = request_irq(irq, nuc900fb_irqhandler, 0, |
591 | pdev->name, fbinfo); | 591 | pdev->name, fbinfo); |
592 | if (ret) { | 592 | if (ret) { |
593 | dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n", | 593 | dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n", |
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 4e888ac09b3f..ca00843ed2fe 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
@@ -1067,7 +1067,7 @@ static int taal_probe(struct omap_dss_device *dssdev) | |||
1067 | gpio_direction_input(gpio); | 1067 | gpio_direction_input(gpio); |
1068 | 1068 | ||
1069 | r = request_irq(gpio_to_irq(gpio), taal_te_isr, | 1069 | r = request_irq(gpio_to_irq(gpio), taal_te_isr, |
1070 | IRQF_DISABLED | IRQF_TRIGGER_RISING, | 1070 | IRQF_TRIGGER_RISING, |
1071 | "taal vsync", dssdev); | 1071 | "taal vsync", dssdev); |
1072 | 1072 | ||
1073 | if (r) { | 1073 | if (r) { |
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 65560a1a0439..213fbbcf613b 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
@@ -1082,7 +1082,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) | |||
1082 | } | 1082 | } |
1083 | 1083 | ||
1084 | retval = request_irq(ps3fb.irq_no, ps3fb_vsync_interrupt, | 1084 | retval = request_irq(ps3fb.irq_no, ps3fb_vsync_interrupt, |
1085 | IRQF_DISABLED, DEVICE_NAME, &dev->core); | 1085 | 0, DEVICE_NAME, &dev->core); |
1086 | if (retval) { | 1086 | if (retval) { |
1087 | dev_err(&dev->core, "%s: request_irq failed %d\n", __func__, | 1087 | dev_err(&dev->core, "%s: request_irq failed %d\n", __func__, |
1088 | retval); | 1088 | retval); |
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c index d8de5577d3cf..1ed8b366618d 100644 --- a/drivers/video/pxa3xx-gcu.c +++ b/drivers/video/pxa3xx-gcu.c | |||
@@ -676,7 +676,7 @@ pxa3xx_gcu_probe(struct platform_device *dev) | |||
676 | } | 676 | } |
677 | 677 | ||
678 | ret = request_irq(irq, pxa3xx_gcu_handle_irq, | 678 | ret = request_irq(irq, pxa3xx_gcu_handle_irq, |
679 | IRQF_DISABLED, DRV_NAME, priv); | 679 | 0, DRV_NAME, priv); |
680 | if (ret) { | 680 | if (ret) { |
681 | dev_err(&dev->dev, "request_irq failed\n"); | 681 | dev_err(&dev->dev, "request_irq failed\n"); |
682 | ret = -EBUSY; | 682 | ret = -EBUSY; |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 0f4e8c942f9e..e89778f4081f 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -2191,7 +2191,7 @@ static int __devinit pxafb_probe(struct platform_device *dev) | |||
2191 | goto failed_free_mem; | 2191 | goto failed_free_mem; |
2192 | } | 2192 | } |
2193 | 2193 | ||
2194 | ret = request_irq(irq, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi); | 2194 | ret = request_irq(irq, pxafb_handle_irq, 0, "LCD", fbi); |
2195 | if (ret) { | 2195 | if (ret) { |
2196 | dev_err(&dev->dev, "request_irq failed: %d\n", ret); | 2196 | dev_err(&dev->dev, "request_irq failed: %d\n", ret); |
2197 | ret = -EBUSY; | 2197 | ret = -EBUSY; |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 798144a4eedd..ee4c0df217f7 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -910,7 +910,7 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev, | |||
910 | for (i = 0; i < 256; i++) | 910 | for (i = 0; i < 256; i++) |
911 | info->palette_buffer[i] = PALETTE_BUFF_CLEAR; | 911 | info->palette_buffer[i] = PALETTE_BUFF_CLEAR; |
912 | 912 | ||
913 | ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info); | 913 | ret = request_irq(irq, s3c2410fb_irq, 0, pdev->name, info); |
914 | if (ret) { | 914 | if (ret) { |
915 | dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret); | 915 | dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret); |
916 | ret = -EBUSY; | 916 | ret = -EBUSY; |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index e8b76d65a070..98d55d0e2da5 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -1457,8 +1457,7 @@ static int __devinit sa1100fb_probe(struct platform_device *pdev) | |||
1457 | if (ret) | 1457 | if (ret) |
1458 | goto failed; | 1458 | goto failed; |
1459 | 1459 | ||
1460 | ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED, | 1460 | ret = request_irq(irq, sa1100fb_handle_irq, 0, "LCD", fbi); |
1461 | "LCD", fbi); | ||
1462 | if (ret) { | 1461 | if (ret) { |
1463 | printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret); | 1462 | printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret); |
1464 | goto failed; | 1463 | goto failed; |
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 97ab8bac2494..3a41c013d031 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -1576,7 +1576,7 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
1576 | 1576 | ||
1577 | platform_set_drvdata(pdev, priv); | 1577 | platform_set_drvdata(pdev, priv); |
1578 | 1578 | ||
1579 | error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED, | 1579 | error = request_irq(i, sh_mobile_lcdc_irq, 0, |
1580 | dev_name(&pdev->dev), priv); | 1580 | dev_name(&pdev->dev), priv); |
1581 | if (error) { | 1581 | if (error) { |
1582 | dev_err(&pdev->dev, "unable to request irq\n"); | 1582 | dev_err(&pdev->dev, "unable to request irq\n"); |
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c index cd1c4dcef8fd..8e4a446b5ed1 100644 --- a/drivers/video/tmiofb.c +++ b/drivers/video/tmiofb.c | |||
@@ -744,7 +744,7 @@ static int __devinit tmiofb_probe(struct platform_device *dev) | |||
744 | goto err_ioremap_vram; | 744 | goto err_ioremap_vram; |
745 | } | 745 | } |
746 | 746 | ||
747 | retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED, | 747 | retval = request_irq(irq, &tmiofb_irq, 0, |
748 | dev_name(&dev->dev), info); | 748 | dev_name(&dev->dev), info); |
749 | 749 | ||
750 | if (retval) | 750 | if (retval) |
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c index c13c246be9a5..777c21dd7a6b 100644 --- a/drivers/video/vt8500lcdfb.c +++ b/drivers/video/vt8500lcdfb.c | |||
@@ -355,7 +355,7 @@ static int __devinit vt8500lcd_probe(struct platform_device *pdev) | |||
355 | goto failed_free_palette; | 355 | goto failed_free_palette; |
356 | } | 356 | } |
357 | 357 | ||
358 | ret = request_irq(irq, vt8500lcd_handle_irq, IRQF_DISABLED, "LCD", fbi); | 358 | ret = request_irq(irq, vt8500lcd_handle_irq, 0, "LCD", fbi); |
359 | if (ret) { | 359 | if (ret) { |
360 | dev_err(&pdev->dev, "request_irq failed: %d\n", ret); | 360 | dev_err(&pdev->dev, "request_irq failed: %d\n", ret); |
361 | ret = -EBUSY; | 361 | ret = -EBUSY; |