[PATCH] irq-flags: video: Use the new IRQF_ constants

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 7 insertions, 7 deletions

diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 466042808daf..fd95c2dbd4f7 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -561,7 +561,7 @@ static int __init arcfb_probe(struct platform_device *dev)
         platform_set_drvdata(dev, info);
         if (irq) {
                 par->irq = irq;
-                if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
+                if (request_irq(par->irq, &arcfb_interrupt, IRQF_SHARED,
                                 "arcfb", info)) {
                         printk(KERN_INFO
                                 "arcfb: Failed req IRQ %d\n", par->irq);
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 85fcd22e6ed5..0c9706746d79 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -1567,7 +1567,7 @@ static int aty_enable_irq(struct atyfb_par *par, int reenable)
         u32 int_cntl;
 
         if (!test_and_set_bit(0, &par->irq_flags)) {
-                if (request_irq(par->irq, aty_irq, SA_SHIRQ, "atyfb", par)) {
+                if (request_irq(par->irq, aty_irq, IRQF_SHARED, "atyfb", par)) {
                         clear_bit(0, &par->irq_flags);
                         return -EINVAL;
                 }
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 600d3e0e08b7..c6a5f0ccc107 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1694,7 +1694,7 @@ static int au1200fb_drv_probe(struct device *dev)
 
         /* Now hook interrupt too */
         if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
-                          SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) {
+                          IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) {
                 print_err("fail to request interrupt line %d (err: %d)",
                           AU1200_LCD_INT, ret);
                 goto failed;
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 8b5bf7972ee3..4a57dabb77d4 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -233,7 +233,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) {
 
         if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) {
                 if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq,
-                                SA_SHIRQ, "matroxfb", MINFO)) {
+                                IRQF_SHARED, "matroxfb", MINFO)) {
                         clear_bit(0, &ACCESS_FBINFO(irq_flags));
                         return -EINVAL;
                 }
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 54663a9baf43..bbb07106cd54 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1334,7 +1334,7 @@ int __init pxafb_probe(struct platform_device *dev)
                 goto failed;
         }
 
-        ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi);
+        ret = request_irq(IRQ_LCD, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi);
         if (ret) {
                 dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                 ret = -EBUSY;
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index fbc411850686..f461eb10cc79 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -735,7 +735,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
 
         dprintk("got LCD region\n");
 
-        ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info);
+        ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info);
         if (ret) {
                 dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
                 ret = -EBUSY;
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 553fd84af44f..a2e6e7205d7e 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1472,7 +1472,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
         if (ret)
                 goto failed;
 
-        ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT,
+        ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED,
                           "LCD", fbi);
         if (ret) {
                 printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret);