aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c2
-rw-r--r--drivers/media/dvb/pluto2/pluto2.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c2
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c2
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c2
-rw-r--r--drivers/media/video/meye.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 5b20cf5a29f0..971a8b18f6dd 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -662,7 +662,7 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
662 if (ret < 0) 662 if (ret < 0)
663 goto err_kfree; 663 goto err_kfree;
664 664
665 ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 665 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
666 if (ret < 0) 666 if (ret < 0)
667 goto err_pci_disable_device; 667 goto err_pci_disable_device;
668 668
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index ee89623be85a..598eaf8acc6e 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
616 /* enable interrupts */ 616 /* enable interrupts */
617 pci_write_config_dword(pdev, 0x6c, 0x8000); 617 pci_write_config_dword(pdev, 0x6c, 0x8000);
618 618
619 ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 619 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
620 if (ret < 0) 620 if (ret < 0)
621 goto err_pci_disable_device; 621 goto err_pci_disable_device;
622 622
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 74f619d6cc93..23b7499b3185 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4317,7 +4317,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
4317 btv->c.nr); 4317 btv->c.nr);
4318 return -EIO; 4318 return -EIO;
4319 } 4319 }
4320 if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) { 4320 if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
4321 printk(KERN_WARNING "bttv%d: No suitable DMA available.\n", 4321 printk(KERN_WARNING "bttv%d: No suitable DMA available.\n",
4322 btv->c.nr); 4322 btv->c.nr);
4323 return -EIO; 4323 return -EIO;
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index ce98d955231a..0ccdf36626e3 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -745,7 +745,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
745 return err; 745 return err;
746 } 746 }
747 747
748 if (!pci_dma_supported(pci,DMA_32BIT_MASK)) { 748 if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
749 dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name); 749 dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
750 err = -EIO; 750 err = -EIO;
751 cx88_core_put(core,pci); 751 cx88_core_put(core,pci);
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index b295b76737e3..da4e3912cd37 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -455,7 +455,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
455 if (pci_enable_device(dev->pci)) 455 if (pci_enable_device(dev->pci))
456 return -EIO; 456 return -EIO;
457 pci_set_master(dev->pci); 457 pci_set_master(dev->pci);
458 if (!pci_dma_supported(dev->pci,DMA_32BIT_MASK)) { 458 if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
459 printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name); 459 printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
460 return -EIO; 460 return -EIO;
461 } 461 }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index ec0425d9043a..b993d42fe73c 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1832,7 +1832,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1832 dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0)); 1832 dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
1833 1833
1834 pci_set_master(pci_dev); 1834 pci_set_master(pci_dev);
1835 if (!pci_dma_supported(pci_dev,DMA_32BIT_MASK)) { 1835 if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
1836 printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name); 1836 printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
1837 err = -EIO; 1837 err = -EIO;
1838 goto fail_core; 1838 goto fail_core;
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 2ad11f0999c6..1d66855a379a 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -117,7 +117,7 @@ static int ptable_alloc(void)
117 memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable)); 117 memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
118 118
119 /* give only 32 bit DMA addresses */ 119 /* give only 32 bit DMA addresses */
120 if (dma_set_mask(&meye.mchip_dev->dev, DMA_32BIT_MASK)) 120 if (dma_set_mask(&meye.mchip_dev->dev, DMA_BIT_MASK(32)))
121 return -1; 121 return -1;
122 122
123 meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev, 123 meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 0bb09f1723d1..2def6fec814b 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -911,7 +911,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
911 pci_name(pci_dev), dev->pci_rev, pci_dev->irq, 911 pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
912 dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0)); 912 dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
913 pci_set_master(pci_dev); 913 pci_set_master(pci_dev);
914 if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) { 914 if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
915 printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name); 915 printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
916 err = -EIO; 916 err = -EIO;
917 goto fail1; 917 goto fail1;