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

Commit 8076fe32 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarThomas 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: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ba02bec

drivers/media/common/saa7146_core.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	saa7146_write(dev, MC2, 0xf8000000);



	/* request an interrupt for the saa7146 */

	err = request_irq(pci->irq, interrupt_hw, SA_SHIRQ | SA_INTERRUPT,

	err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,

			  dev->name, dev);

	if (err < 0) {

		ERR(("request_irq() failed.\n"));

drivers/media/dvb/b2c2/flexcop-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) 
	pci_set_drvdata(fc_pci->pdev, fc_pci);



	if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,

					SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0)

					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)

		goto err_pci_iounmap;



	spin_lock_init(&fc_pci->irq_lock);

drivers/media/dvb/bt8xx/bt878.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int __devinit bt878_probe(struct pci_dev *dev, 
	btwrite(0, BT848_INT_MASK);



	result = request_irq(bt->irq, bt878_irq,

			     SA_SHIRQ | SA_INTERRUPT, "bt878",

			     IRQF_SHARED | IRQF_DISABLED, "bt878",

			     (void *) bt);

	if (result == -EINVAL) {

		printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",

drivers/media/dvb/pluto2/pluto2.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, pluto);



	ret = request_irq(pdev->irq, pluto_irq, SA_SHIRQ, DRIVER_NAME, pluto);

	ret = request_irq(pdev->irq, pluto_irq, IRQF_SHARED, DRIVER_NAME, pluto);

	if (ret < 0)

		goto err_pci_iounmap;

drivers/media/video/bt8xx/bttv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -4050,7 +4050,7 @@ static int __devinit bttv_probe(struct pci_dev *dev, 
	/* disable irqs, register irq handler */

	btwrite(0, BT848_INT_MASK);

	result = request_irq(btv->c.pci->irq, bttv_irq,

			     SA_SHIRQ | SA_INTERRUPT,btv->c.name,(void *)btv);

			     IRQF_SHARED | IRQF_DISABLED,btv->c.name,(void *)btv);

	if (result < 0) {

		printk(KERN_ERR "bttv%d: can't get IRQ %d\n",

		       bttv_num,btv->c.pci->irq);