mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Signed-off-by: Yang Hongyang<[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
6afd142fd0
commit
284901a90a
173 changed files with 309 additions and 313 deletions
|
|
@ -662,7 +662,7 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
|
|||
if (ret < 0)
|
||||
goto err_kfree;
|
||||
|
||||
ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (ret < 0)
|
||||
goto err_pci_disable_device;
|
||||
|
||||
|
|
|
|||
|
|
@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
|
|||
/* enable interrupts */
|
||||
pci_write_config_dword(pdev, 0x6c, 0x8000);
|
||||
|
||||
ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (ret < 0)
|
||||
goto err_pci_disable_device;
|
||||
|
||||
|
|
|
|||
|
|
@ -4317,7 +4317,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
|
|||
btv->c.nr);
|
||||
return -EIO;
|
||||
}
|
||||
if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
|
||||
if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
|
||||
printk(KERN_WARNING "bttv%d: No suitable DMA available.\n",
|
||||
btv->c.nr);
|
||||
return -EIO;
|
||||
|
|
|
|||
|
|
@ -745,7 +745,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
|
|||
return err;
|
||||
}
|
||||
|
||||
if (!pci_dma_supported(pci,DMA_32BIT_MASK)) {
|
||||
if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
|
||||
dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
|
||||
err = -EIO;
|
||||
cx88_core_put(core,pci);
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
|
|||
if (pci_enable_device(dev->pci))
|
||||
return -EIO;
|
||||
pci_set_master(dev->pci);
|
||||
if (!pci_dma_supported(dev->pci,DMA_32BIT_MASK)) {
|
||||
if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
|
||||
printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
|
||||
return -EIO;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1832,7 +1832,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
|
|||
dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
|
||||
|
||||
pci_set_master(pci_dev);
|
||||
if (!pci_dma_supported(pci_dev,DMA_32BIT_MASK)) {
|
||||
if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
|
||||
printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
|
||||
err = -EIO;
|
||||
goto fail_core;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static int ptable_alloc(void)
|
|||
memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
|
||||
|
||||
/* give only 32 bit DMA addresses */
|
||||
if (dma_set_mask(&meye.mchip_dev->dev, DMA_32BIT_MASK))
|
||||
if (dma_set_mask(&meye.mchip_dev->dev, DMA_BIT_MASK(32)))
|
||||
return -1;
|
||||
|
||||
meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,
|
||||
|
|
|
|||
|
|
@ -911,7 +911,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
|
|||
pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
|
||||
dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
|
||||
pci_set_master(pci_dev);
|
||||
if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) {
|
||||
if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
|
||||
printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
|
||||
err = -EIO;
|
||||
goto fail1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue