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/cx88 | |
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/cx88')
-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 |
3 files changed, 3 insertions, 3 deletions
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); |