dma-mapping: replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28)
Replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
28b7679677
commit
ce0b620160
|
@ -586,8 +586,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
|
|||
We set both dma_mask and consistent_dma_mask to 28 bits
|
||||
and pray pci_alloc_consistent() will use this info. It should
|
||||
work on most platforms */
|
||||
if (pci_set_consistent_dma_mask(pdev, DMA_28BIT_MASK) ||
|
||||
pci_set_dma_mask(pdev, DMA_28BIT_MASK)) {
|
||||
if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(28)) ||
|
||||
pci_set_dma_mask(pdev, DMA_BIT_MASK(28))) {
|
||||
printk(KERN_ERR "wanXL: No usable DMA configuration\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
|
|
@ -689,8 +689,8 @@ static int __devinit snd_als300_create(struct snd_card *card,
|
|||
if ((err = pci_enable_device(pci)) < 0)
|
||||
return err;
|
||||
|
||||
if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
|
||||
printk(KERN_ERR "error setting 28bit DMA mask\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
|
|
@ -897,8 +897,8 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
|
|||
|
||||
if ((err = pci_enable_device(pci)) < 0)
|
||||
return err;
|
||||
if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
|
||||
snd_printk(KERN_ERR "error to set 28bit mask DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
|
|
@ -2539,8 +2539,8 @@ static int __devinit snd_es1968_create(struct snd_card *card,
|
|||
if ((err = pci_enable_device(pci)) < 0)
|
||||
return err;
|
||||
/* check, if we can restrict PCI DMA transfers to 28 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
|
|
@ -2533,8 +2533,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
|
|||
if (err < 0)
|
||||
return err;
|
||||
/* check, if we can restrict PCI DMA transfers to 28 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
|
|
@ -2530,8 +2530,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
|
|||
return -EIO;
|
||||
|
||||
/* check, if we can restrict PCI DMA transfers to 28 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
|
Loading…
Reference in a new issue