tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Thomas Gleixner and committed by Linus Torvalds 63a43399 d54b5caa

+7 -7
unified split
+1 -1
drivers/video/arcfb.c
··· 561 561 platform_set_drvdata(dev, info); 562 562 if (irq) { 563 563 par->irq = irq; 564 - if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ, 564 + if (request_irq(par->irq, &arcfb_interrupt, IRQF_SHARED, 565 565 "arcfb", info)) { 566 566 printk(KERN_INFO 567 567 "arcfb: Failed req IRQ %d\n", par->irq);
+1 -1
drivers/video/aty/atyfb_base.c
··· 1567 1567 u32 int_cntl; 1568 1568 1569 1569 if (!test_and_set_bit(0, &par->irq_flags)) { 1570 - if (request_irq(par->irq, aty_irq, SA_SHIRQ, "atyfb", par)) { 1570 + if (request_irq(par->irq, aty_irq, IRQF_SHARED, "atyfb", par)) { 1571 1571 clear_bit(0, &par->irq_flags); 1572 1572 return -EINVAL; 1573 1573 }
+1 -1
drivers/video/au1200fb.c
··· 1694 1694 1695 1695 /* Now hook interrupt too */ 1696 1696 if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq, 1697 - SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) { 1697 + IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) { 1698 1698 print_err("fail to request interrupt line %d (err: %d)", 1699 1699 AU1200_LCD_INT, ret); 1700 1700 goto failed;
+1 -1
drivers/video/matrox/matroxfb_base.c
··· 233 233 234 234 if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) { 235 235 if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq, 236 - SA_SHIRQ, "matroxfb", MINFO)) { 236 + IRQF_SHARED, "matroxfb", MINFO)) { 237 237 clear_bit(0, &ACCESS_FBINFO(irq_flags)); 238 238 return -EINVAL; 239 239 }
+1 -1
drivers/video/pxafb.c
··· 1334 1334 goto failed; 1335 1335 } 1336 1336 1337 - ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi); 1337 + ret = request_irq(IRQ_LCD, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi); 1338 1338 if (ret) { 1339 1339 dev_err(&dev->dev, "request_irq failed: %d\n", ret); 1340 1340 ret = -EBUSY;
+1 -1
drivers/video/s3c2410fb.c
··· 735 735 736 736 dprintk("got LCD region\n"); 737 737 738 - ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info); 738 + ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info); 739 739 if (ret) { 740 740 dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret); 741 741 ret = -EBUSY;
+1 -1
drivers/video/sa1100fb.c
··· 1472 1472 if (ret) 1473 1473 goto failed; 1474 1474 1475 - ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT, 1475 + ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED, 1476 1476 "LCD", fbi); 1477 1477 if (ret) { 1478 1478 printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret);