diff options
| author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:12 -0400 |
| commit | ce0b620160e6d15a7f5b4b00cd7b8bd956d427d1 (patch) | |
| tree | f459e0a141eb65ad56517c12ad78c779608dee1d /sound | |
| parent | 28b767967763835d8526f6baedc25a8a86052640 (diff) | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/als300.c | 4 | ||||
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 4 | ||||
| -rw-r--r-- | sound/pci/es1968.c | 4 | ||||
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 4 | ||||
| -rw-r--r-- | sound/pci/maestro3.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 009b4c8225a5..3aa35af7ca91 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
| @@ -689,8 +689,8 @@ static int __devinit snd_als300_create(struct snd_card *card, | |||
| 689 | if ((err = pci_enable_device(pci)) < 0) | 689 | if ((err = pci_enable_device(pci)) < 0) |
| 690 | return err; | 690 | return err; |
| 691 | 691 | ||
| 692 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 692 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 693 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 693 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 694 | printk(KERN_ERR "error setting 28bit DMA mask\n"); | 694 | printk(KERN_ERR "error setting 28bit DMA mask\n"); |
| 695 | pci_disable_device(pci); | 695 | pci_disable_device(pci); |
| 696 | return -ENXIO; | 696 | return -ENXIO; |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 31542adc6b7e..1970f0e70f37 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
| @@ -897,8 +897,8 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card, | |||
| 897 | 897 | ||
| 898 | if ((err = pci_enable_device(pci)) < 0) | 898 | if ((err = pci_enable_device(pci)) < 0) |
| 899 | return err; | 899 | return err; |
| 900 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 900 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 901 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 901 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 902 | snd_printk(KERN_ERR "error to set 28bit mask DMA\n"); | 902 | snd_printk(KERN_ERR "error to set 28bit mask DMA\n"); |
| 903 | pci_disable_device(pci); | 903 | pci_disable_device(pci); |
| 904 | return -ENXIO; | 904 | return -ENXIO; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index dc97e8116141..a11f453a6b6d 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
| @@ -2539,8 +2539,8 @@ static int __devinit snd_es1968_create(struct snd_card *card, | |||
| 2539 | if ((err = pci_enable_device(pci)) < 0) | 2539 | if ((err = pci_enable_device(pci)) < 0) |
| 2540 | return err; | 2540 | return err; |
| 2541 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2541 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
| 2542 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 2542 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 2543 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 2543 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 2544 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); | 2544 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
| 2545 | pci_disable_device(pci); | 2545 | pci_disable_device(pci); |
| 2546 | return -ENXIO; | 2546 | return -ENXIO; |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 3dd63f1cda53..0d0cdbdb4486 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -2533,8 +2533,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card, | |||
| 2533 | if (err < 0) | 2533 | if (err < 0) |
| 2534 | return err; | 2534 | return err; |
| 2535 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2535 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
| 2536 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 2536 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 2537 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 2537 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 2538 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); | 2538 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
| 2539 | pci_disable_device(pci); | 2539 | pci_disable_device(pci); |
| 2540 | return -ENXIO; | 2540 | return -ENXIO; |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 70141548f251..75283fbb4b3f 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
| @@ -2530,8 +2530,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, | |||
| 2530 | return -EIO; | 2530 | return -EIO; |
| 2531 | 2531 | ||
| 2532 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2532 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
| 2533 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 2533 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 2534 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 2534 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 2535 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); | 2535 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
| 2536 | pci_disable_device(pci); | 2536 | pci_disable_device(pci); |
| 2537 | return -ENXIO; | 2537 | return -ENXIO; |