[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>
This commit is contained in:
Родитель
9ba02bec38
Коммит
8076fe32a7
|
@ -363,7 +363,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
|
||||||
saa7146_write(dev, MC2, 0xf8000000);
|
saa7146_write(dev, MC2, 0xf8000000);
|
||||||
|
|
||||||
/* request an interrupt for the saa7146 */
|
/* 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);
|
dev->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
ERR(("request_irq() failed.\n"));
|
ERR(("request_irq() failed.\n"));
|
||||||
|
|
|
@ -294,7 +294,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
|
||||||
pci_set_drvdata(fc_pci->pdev, fc_pci);
|
pci_set_drvdata(fc_pci->pdev, fc_pci);
|
||||||
|
|
||||||
if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
|
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;
|
goto err_pci_iounmap;
|
||||||
|
|
||||||
spin_lock_init(&fc_pci->irq_lock);
|
spin_lock_init(&fc_pci->irq_lock);
|
||||||
|
|
|
@ -488,7 +488,7 @@ static int __devinit bt878_probe(struct pci_dev *dev,
|
||||||
btwrite(0, BT848_INT_MASK);
|
btwrite(0, BT848_INT_MASK);
|
||||||
|
|
||||||
result = request_irq(bt->irq, bt878_irq,
|
result = request_irq(bt->irq, bt878_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, "bt878",
|
IRQF_SHARED | IRQF_DISABLED, "bt878",
|
||||||
(void *) bt);
|
(void *) bt);
|
||||||
if (result == -EINVAL) {
|
if (result == -EINVAL) {
|
||||||
printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
|
printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
|
||||||
|
|
|
@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
|
||||||
|
|
||||||
pci_set_drvdata(pdev, pluto);
|
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)
|
if (ret < 0)
|
||||||
goto err_pci_iounmap;
|
goto err_pci_iounmap;
|
||||||
|
|
||||||
|
|
|
@ -4050,7 +4050,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
|
||||||
/* disable irqs, register irq handler */
|
/* disable irqs, register irq handler */
|
||||||
btwrite(0, BT848_INT_MASK);
|
btwrite(0, BT848_INT_MASK);
|
||||||
result = request_irq(btv->c.pci->irq, bttv_irq,
|
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) {
|
if (result < 0) {
|
||||||
printk(KERN_ERR "bttv%d: can't get IRQ %d\n",
|
printk(KERN_ERR "bttv%d: can't get IRQ %d\n",
|
||||||
bttv_num,btv->c.pci->irq);
|
bttv_num,btv->c.pci->irq);
|
||||||
|
|
|
@ -700,7 +700,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
|
||||||
|
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = request_irq(chip->pci->irq, cx8801_irq,
|
err = request_irq(chip->pci->irq, cx8801_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, chip->core->name, chip);
|
IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
dprintk(0, "%s: can't get IRQ %d\n",
|
dprintk(0, "%s: can't get IRQ %d\n",
|
||||||
chip->core->name, chip->pci->irq);
|
chip->core->name, chip->pci->irq);
|
||||||
|
|
|
@ -438,7 +438,7 @@ int cx8802_init_common(struct cx8802_dev *dev)
|
||||||
|
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = request_irq(dev->pci->irq, cx8802_irq,
|
err = request_irq(dev->pci->irq, cx8802_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, dev->core->name, dev);
|
IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
||||||
dev->core->name, dev->pci->irq);
|
dev->core->name, dev->pci->irq);
|
||||||
|
|
|
@ -1915,7 +1915,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
|
||||||
|
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = request_irq(pci_dev->irq, cx8800_irq,
|
err = request_irq(pci_dev->irq, cx8800_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, core->name, dev);
|
IRQF_SHARED | IRQF_DISABLED, core->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
||||||
core->name,pci_dev->irq);
|
core->name,pci_dev->irq);
|
||||||
|
|
|
@ -1881,7 +1881,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
|
||||||
|
|
||||||
meye.mchip_irq = pcidev->irq;
|
meye.mchip_irq = pcidev->irq;
|
||||||
if (request_irq(meye.mchip_irq, meye_irq,
|
if (request_irq(meye.mchip_irq, meye_irq,
|
||||||
SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq)) {
|
IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) {
|
||||||
printk(KERN_ERR "meye: request_irq failed\n");
|
printk(KERN_ERR "meye: request_irq failed\n");
|
||||||
goto outreqirq;
|
goto outreqirq;
|
||||||
}
|
}
|
||||||
|
|
|
@ -929,7 +929,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
|
||||||
|
|
||||||
|
|
||||||
err = request_irq(dev->pci->irq, saa7134_alsa_irq,
|
err = request_irq(dev->pci->irq, saa7134_alsa_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, dev->name,
|
IRQF_SHARED | IRQF_DISABLED, dev->name,
|
||||||
(void*) &dev->dmasound);
|
(void*) &dev->dmasound);
|
||||||
|
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
|
|
|
@ -923,7 +923,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
|
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = request_irq(pci_dev->irq, saa7134_irq,
|
err = request_irq(pci_dev->irq, saa7134_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, dev->name, dev);
|
IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
||||||
dev->name,pci_dev->irq);
|
dev->name,pci_dev->irq);
|
||||||
|
|
|
@ -845,7 +845,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev)
|
||||||
{
|
{
|
||||||
|
|
||||||
if ((request_irq(dev->pci->irq, saa7134_oss_irq,
|
if ((request_irq(dev->pci->irq, saa7134_oss_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT, dev->name,
|
IRQF_SHARED | IRQF_DISABLED, dev->name,
|
||||||
(void*) &dev->dmasound)) < 0)
|
(void*) &dev->dmasound)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
|
@ -1983,7 +1983,7 @@ static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
|
||||||
memcpy(&saa->video_dev, &saa_template, sizeof(saa_template));
|
memcpy(&saa->video_dev, &saa_template, sizeof(saa_template));
|
||||||
saawrite(0, SAA7146_IER); /* turn off all interrupts */
|
saawrite(0, SAA7146_IER); /* turn off all interrupts */
|
||||||
|
|
||||||
retval = request_irq(saa->irq, saa7146_irq, SA_SHIRQ | SA_INTERRUPT,
|
retval = request_irq(saa->irq, saa7146_irq, IRQF_SHARED | IRQF_DISABLED,
|
||||||
"stradis", saa);
|
"stradis", saa);
|
||||||
if (retval == -EINVAL)
|
if (retval == -EINVAL)
|
||||||
dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
|
dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
|
||||||
|
|
|
@ -1380,7 +1380,7 @@ find_zr36057 (void)
|
||||||
|
|
||||||
result = request_irq(zr->pci_dev->irq,
|
result = request_irq(zr->pci_dev->irq,
|
||||||
zoran_irq,
|
zoran_irq,
|
||||||
SA_SHIRQ | SA_INTERRUPT,
|
IRQF_SHARED | IRQF_DISABLED,
|
||||||
ZR_DEVNAME(zr),
|
ZR_DEVNAME(zr),
|
||||||
(void *) zr);
|
(void *) zr);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
|
|
|
@ -1858,7 +1858,7 @@ int __init find_zoran(void)
|
||||||
DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem));
|
DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem));
|
||||||
|
|
||||||
result = request_irq(dev->irq, zoran_irq,
|
result = request_irq(dev->irq, zoran_irq,
|
||||||
SA_SHIRQ|SA_INTERRUPT,"zoran", ztv);
|
IRQF_SHARED|IRQF_DISABLED,"zoran", ztv);
|
||||||
if (result==-EINVAL)
|
if (result==-EINVAL)
|
||||||
{
|
{
|
||||||
iounmap(ztv->zoran_mem);
|
iounmap(ztv->zoran_mem);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче