diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-10-13 01:49:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-10-17 05:08:31 -0400 |
commit | 3e018fe4409eae6fb36b882cb0dfb39859b7c237 (patch) | |
tree | e07d654d3c303375afbe70d7432c7f0e087317ab /drivers/media/pci | |
parent | 9a373d17cc4555322a9044e5ca1ba8744ce273dd (diff) |
[media] misc drivers: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/bt8xx/bt878.c | 3 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-core.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-alsa.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-mpeg.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/meye/meye.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/saa7134/saa7134-alsa.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-core.c | 2 |
10 files changed, 10 insertions, 11 deletions
diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c index 2bd24839a2ae..d0c281f41a0a 100644 --- a/drivers/media/pci/bt8xx/bt878.c +++ b/drivers/media/pci/bt8xx/bt878.c | |||
@@ -488,8 +488,7 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) | |||
488 | btwrite(0, BT848_INT_MASK); | 488 | btwrite(0, BT848_INT_MASK); |
489 | 489 | ||
490 | result = request_irq(bt->irq, bt878_irq, | 490 | result = request_irq(bt->irq, bt878_irq, |
491 | IRQF_SHARED | IRQF_DISABLED, "bt878", | 491 | IRQF_SHARED, "bt878", (void *) bt); |
492 | (void *) bt); | ||
493 | if (result == -EINVAL) { | 492 | if (result == -EINVAL) { |
494 | printk(KERN_ERR "bt878(%d): Bad irq number or handler\n", | 493 | printk(KERN_ERR "bt878(%d): Bad irq number or handler\n", |
495 | bt878_num); | 494 | bt878_num); |
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index c6532de0eac7..a3b1ee9c00d7 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c | |||
@@ -4086,7 +4086,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) | |||
4086 | /* disable irqs, register irq handler */ | 4086 | /* disable irqs, register irq handler */ |
4087 | btwrite(0, BT848_INT_MASK); | 4087 | btwrite(0, BT848_INT_MASK); |
4088 | result = request_irq(btv->c.pci->irq, bttv_irq, | 4088 | result = request_irq(btv->c.pci->irq, bttv_irq, |
4089 | IRQF_SHARED | IRQF_DISABLED, btv->c.v4l2_dev.name, (void *)btv); | 4089 | IRQF_SHARED, btv->c.v4l2_dev.name, (void *)btv); |
4090 | if (result < 0) { | 4090 | if (result < 0) { |
4091 | pr_err("%d: can't get IRQ %d\n", | 4091 | pr_err("%d: can't get IRQ %d\n", |
4092 | bttv_num, btv->c.pci->irq); | 4092 | bttv_num, btv->c.pci->irq); |
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c index 9f63d93239ec..edcd79db1e4e 100644 --- a/drivers/media/pci/cx23885/cx23885-core.c +++ b/drivers/media/pci/cx23885/cx23885-core.c | |||
@@ -2129,7 +2129,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev, | |||
2129 | } | 2129 | } |
2130 | 2130 | ||
2131 | err = request_irq(pci_dev->irq, cx23885_irq, | 2131 | err = request_irq(pci_dev->irq, cx23885_irq, |
2132 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 2132 | IRQF_SHARED, dev->name, dev); |
2133 | if (err < 0) { | 2133 | if (err < 0) { |
2134 | printk(KERN_ERR "%s: can't get IRQ %d\n", | 2134 | printk(KERN_ERR "%s: can't get IRQ %d\n", |
2135 | dev->name, pci_dev->irq); | 2135 | dev->name, pci_dev->irq); |
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index 11d069295032..400eb1c42d3f 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c | |||
@@ -834,7 +834,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci, | |||
834 | 834 | ||
835 | /* get irq */ | 835 | /* get irq */ |
836 | err = request_irq(chip->pci->irq, cx8801_irq, | 836 | err = request_irq(chip->pci->irq, cx8801_irq, |
837 | IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip); | 837 | IRQF_SHARED, chip->core->name, chip); |
838 | if (err < 0) { | 838 | if (err < 0) { |
839 | dprintk(0, "%s: can't get IRQ %d\n", | 839 | dprintk(0, "%s: can't get IRQ %d\n", |
840 | chip->core->name, chip->pci->irq); | 840 | chip->core->name, chip->pci->irq); |
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c index 684eff57717f..74b7b8614c23 100644 --- a/drivers/media/pci/cx88/cx88-mpeg.c +++ b/drivers/media/pci/cx88/cx88-mpeg.c | |||
@@ -499,7 +499,7 @@ static int cx8802_init_common(struct cx8802_dev *dev) | |||
499 | 499 | ||
500 | /* get irq */ | 500 | /* get irq */ |
501 | err = request_irq(dev->pci->irq, cx8802_irq, | 501 | err = request_irq(dev->pci->irq, cx8802_irq, |
502 | IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev); | 502 | IRQF_SHARED, dev->core->name, dev); |
503 | if (err < 0) { | 503 | if (err < 0) { |
504 | printk(KERN_ERR "%s: can't get IRQ %d\n", | 504 | printk(KERN_ERR "%s: can't get IRQ %d\n", |
505 | dev->core->name, dev->pci->irq); | 505 | dev->core->name, dev->pci->irq); |
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index 1aed764a35dd..ed8cb9037b6f 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
@@ -1738,7 +1738,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, | |||
1738 | 1738 | ||
1739 | /* get irq */ | 1739 | /* get irq */ |
1740 | err = request_irq(pci_dev->irq, cx8800_irq, | 1740 | err = request_irq(pci_dev->irq, cx8800_irq, |
1741 | IRQF_SHARED | IRQF_DISABLED, core->name, dev); | 1741 | IRQF_SHARED, core->name, dev); |
1742 | if (err < 0) { | 1742 | if (err < 0) { |
1743 | printk(KERN_ERR "%s/0: can't get IRQ %d\n", | 1743 | printk(KERN_ERR "%s/0: can't get IRQ %d\n", |
1744 | core->name,pci_dev->irq); | 1744 | core->name,pci_dev->irq); |
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index 2381b05432e6..54d5c821007c 100644 --- a/drivers/media/pci/meye/meye.c +++ b/drivers/media/pci/meye/meye.c | |||
@@ -1698,7 +1698,7 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) | |||
1698 | 1698 | ||
1699 | meye.mchip_irq = pcidev->irq; | 1699 | meye.mchip_irq = pcidev->irq; |
1700 | if (request_irq(meye.mchip_irq, meye_irq, | 1700 | if (request_irq(meye.mchip_irq, meye_irq, |
1701 | IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) { | 1701 | IRQF_SHARED, "meye", meye_irq)) { |
1702 | v4l2_err(v4l2_dev, "request_irq failed\n"); | 1702 | v4l2_err(v4l2_dev, "request_irq failed\n"); |
1703 | goto outreqirq; | 1703 | goto outreqirq; |
1704 | } | 1704 | } |
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c index dbcdfbf8aed0..dd67c8a400cc 100644 --- a/drivers/media/pci/saa7134/saa7134-alsa.c +++ b/drivers/media/pci/saa7134/saa7134-alsa.c | |||
@@ -1096,7 +1096,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | |||
1096 | 1096 | ||
1097 | 1097 | ||
1098 | err = request_irq(dev->pci->irq, saa7134_alsa_irq, | 1098 | err = request_irq(dev->pci->irq, saa7134_alsa_irq, |
1099 | IRQF_SHARED | IRQF_DISABLED, dev->name, | 1099 | IRQF_SHARED, dev->name, |
1100 | (void*) &dev->dmasound); | 1100 | (void*) &dev->dmasound); |
1101 | 1101 | ||
1102 | if (err < 0) { | 1102 | if (err < 0) { |
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c index 45f0aca597ae..27d7ee709c58 100644 --- a/drivers/media/pci/saa7134/saa7134-core.c +++ b/drivers/media/pci/saa7134/saa7134-core.c | |||
@@ -992,7 +992,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev, | |||
992 | 992 | ||
993 | /* get irq */ | 993 | /* get irq */ |
994 | err = request_irq(pci_dev->irq, saa7134_irq, | 994 | err = request_irq(pci_dev->irq, saa7134_irq, |
995 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 995 | IRQF_SHARED, dev->name, dev); |
996 | if (err < 0) { | 996 | if (err < 0) { |
997 | printk(KERN_ERR "%s: can't get IRQ %d\n", | 997 | printk(KERN_ERR "%s: can't get IRQ %d\n", |
998 | dev->name,pci_dev->irq); | 998 | dev->name,pci_dev->irq); |
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c index 41adf260d13b..57ef5456f1e8 100644 --- a/drivers/media/pci/saa7164/saa7164-core.c +++ b/drivers/media/pci/saa7164/saa7164-core.c | |||
@@ -1232,7 +1232,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev, | |||
1232 | } | 1232 | } |
1233 | 1233 | ||
1234 | err = request_irq(pci_dev->irq, saa7164_irq, | 1234 | err = request_irq(pci_dev->irq, saa7164_irq, |
1235 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); | 1235 | IRQF_SHARED, dev->name, dev); |
1236 | if (err < 0) { | 1236 | if (err < 0) { |
1237 | printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name, | 1237 | printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name, |
1238 | pci_dev->irq); | 1238 | pci_dev->irq); |