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: media: 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: Mauro Carvalho Chehab <mchehab@infradead.org>
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 8076fe32 9ba02bec

+15 -15
unified split
+1 -1
drivers/media/common/saa7146_core.c
··· 363 363 saa7146_write(dev, MC2, 0xf8000000); 364 364 365 365 /* request an interrupt for the saa7146 */ 366 - err = request_irq(pci->irq, interrupt_hw, SA_SHIRQ | SA_INTERRUPT, 366 + err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED, 367 367 dev->name, dev); 368 368 if (err < 0) { 369 369 ERR(("request_irq() failed.\n"));
+1 -1
drivers/media/dvb/b2c2/flexcop-pci.c
··· 294 294 pci_set_drvdata(fc_pci->pdev, fc_pci); 295 295 296 296 if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr, 297 - SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0) 297 + IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0) 298 298 goto err_pci_iounmap; 299 299 300 300 spin_lock_init(&fc_pci->irq_lock);
+1 -1
drivers/media/dvb/bt8xx/bt878.c
··· 488 488 btwrite(0, BT848_INT_MASK); 489 489 490 490 result = request_irq(bt->irq, bt878_irq, 491 - SA_SHIRQ | SA_INTERRUPT, "bt878", 491 + IRQF_SHARED | IRQF_DISABLED, "bt878", 492 492 (void *) bt); 493 493 if (result == -EINVAL) { 494 494 printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
+1 -1
drivers/media/dvb/pluto2/pluto2.c
··· 616 616 617 617 pci_set_drvdata(pdev, pluto); 618 618 619 - ret = request_irq(pdev->irq, pluto_irq, SA_SHIRQ, DRIVER_NAME, pluto); 619 + ret = request_irq(pdev->irq, pluto_irq, IRQF_SHARED, DRIVER_NAME, pluto); 620 620 if (ret < 0) 621 621 goto err_pci_iounmap; 622 622
+1 -1
drivers/media/video/bt8xx/bttv-driver.c
··· 4050 4050 /* disable irqs, register irq handler */ 4051 4051 btwrite(0, BT848_INT_MASK); 4052 4052 result = request_irq(btv->c.pci->irq, bttv_irq, 4053 - SA_SHIRQ | SA_INTERRUPT,btv->c.name,(void *)btv); 4053 + IRQF_SHARED | IRQF_DISABLED,btv->c.name,(void *)btv); 4054 4054 if (result < 0) { 4055 4055 printk(KERN_ERR "bttv%d: can't get IRQ %d\n", 4056 4056 bttv_num,btv->c.pci->irq);
+1 -1
drivers/media/video/cx88/cx88-alsa.c
··· 700 700 701 701 /* get irq */ 702 702 err = request_irq(chip->pci->irq, cx8801_irq, 703 - SA_SHIRQ | SA_INTERRUPT, chip->core->name, chip); 703 + IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip); 704 704 if (err < 0) { 705 705 dprintk(0, "%s: can't get IRQ %d\n", 706 706 chip->core->name, chip->pci->irq);
+1 -1
drivers/media/video/cx88/cx88-mpeg.c
··· 438 438 439 439 /* get irq */ 440 440 err = request_irq(dev->pci->irq, cx8802_irq, 441 - SA_SHIRQ | SA_INTERRUPT, dev->core->name, dev); 441 + IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev); 442 442 if (err < 0) { 443 443 printk(KERN_ERR "%s: can't get IRQ %d\n", 444 444 dev->core->name, dev->pci->irq);
+1 -1
drivers/media/video/cx88/cx88-video.c
··· 1915 1915 1916 1916 /* get irq */ 1917 1917 err = request_irq(pci_dev->irq, cx8800_irq, 1918 - SA_SHIRQ | SA_INTERRUPT, core->name, dev); 1918 + IRQF_SHARED | IRQF_DISABLED, core->name, dev); 1919 1919 if (err < 0) { 1920 1920 printk(KERN_ERR "%s: can't get IRQ %d\n", 1921 1921 core->name,pci_dev->irq);
+1 -1
drivers/media/video/meye.c
··· 1881 1881 1882 1882 meye.mchip_irq = pcidev->irq; 1883 1883 if (request_irq(meye.mchip_irq, meye_irq, 1884 - SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq)) { 1884 + IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) { 1885 1885 printk(KERN_ERR "meye: request_irq failed\n"); 1886 1886 goto outreqirq; 1887 1887 }
+1 -1
drivers/media/video/saa7134/saa7134-alsa.c
··· 929 929 930 930 931 931 err = request_irq(dev->pci->irq, saa7134_alsa_irq, 932 - SA_SHIRQ | SA_INTERRUPT, dev->name, 932 + IRQF_SHARED | IRQF_DISABLED, dev->name, 933 933 (void*) &dev->dmasound); 934 934 935 935 if (err < 0) {
+1 -1
drivers/media/video/saa7134/saa7134-core.c
··· 923 923 924 924 /* get irq */ 925 925 err = request_irq(pci_dev->irq, saa7134_irq, 926 - SA_SHIRQ | SA_INTERRUPT, dev->name, dev); 926 + IRQF_SHARED | IRQF_DISABLED, dev->name, dev); 927 927 if (err < 0) { 928 928 printk(KERN_ERR "%s: can't get IRQ %d\n", 929 929 dev->name,pci_dev->irq);
+1 -1
drivers/media/video/saa7134/saa7134-oss.c
··· 845 845 { 846 846 847 847 if ((request_irq(dev->pci->irq, saa7134_oss_irq, 848 - SA_SHIRQ | SA_INTERRUPT, dev->name, 848 + IRQF_SHARED | IRQF_DISABLED, dev->name, 849 849 (void*) &dev->dmasound)) < 0) 850 850 return -1; 851 851
+1 -1
drivers/media/video/stradis.c
··· 1983 1983 memcpy(&saa->video_dev, &saa_template, sizeof(saa_template)); 1984 1984 saawrite(0, SAA7146_IER); /* turn off all interrupts */ 1985 1985 1986 - retval = request_irq(saa->irq, saa7146_irq, SA_SHIRQ | SA_INTERRUPT, 1986 + retval = request_irq(saa->irq, saa7146_irq, IRQF_SHARED | IRQF_DISABLED, 1987 1987 "stradis", saa); 1988 1988 if (retval == -EINVAL) 1989 1989 dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
+1 -1
drivers/media/video/zoran_card.c
··· 1380 1380 1381 1381 result = request_irq(zr->pci_dev->irq, 1382 1382 zoran_irq, 1383 - SA_SHIRQ | SA_INTERRUPT, 1383 + IRQF_SHARED | IRQF_DISABLED, 1384 1384 ZR_DEVNAME(zr), 1385 1385 (void *) zr); 1386 1386 if (result < 0) {
+1 -1
drivers/media/video/zr36120.c
··· 1858 1858 DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem)); 1859 1859 1860 1860 result = request_irq(dev->irq, zoran_irq, 1861 - SA_SHIRQ|SA_INTERRUPT,"zoran", ztv); 1861 + IRQF_SHARED|IRQF_DISABLED,"zoran", ztv); 1862 1862 if (result==-EINVAL) 1863 1863 { 1864 1864 iounmap(ztv->zoran_mem);