Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63a43399 authored Jul 01, 2006 by Thomas Gleixner Committed by Linus Torvalds Jul 02, 2006

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

parent d54b5caa

drivers/video/arcfb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/video/aty/atyfb_base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/video/au1200fb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/video/matrox/matroxfb_base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/video/pxafb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;