sound: Create and use DMA_28BIT_MASK
Subsystems (4)
PATCH 1/1 sound: Create and use DMA_28BIT_MASK
This patch introduces the DMA_28BIT_MASK constant in dma-mapping.h ALSA drivers using this mask are changed to use the new constant.
Signed-off-by Tobias Klauser <[email protected]>
---
include/linux/dma-mapping.h | 1 + sound/pci/ad1889.c | 7 ++++--- sound/pci/emu10k1/emu10k1x.c | 13 +++++++------ sound/pci/es1968.c | 5 +++-- sound/pci/ice1712/ice1712.c | 5 +++-- sound/pci/maestro3.c | 5 +++-- sound/pci/mixart/mixart.c | 3 ++- sound/pci/pcxhr/pcxhr.c | 3 ++- 8 files changed, 25 insertions(+), 17 deletions(-)
99c5d8c1b63887d6ae17ecc9623fcf6488b114bc
include/linux/dma-mapping.h +1 -0
@@ -20,6 +20,7 @@ enum dma_data_direction {#define DMA_31BIT_MASK 0x000000007fffffffULL#define DMA_30BIT_MASK 0x000000003fffffffULL#define DMA_29BIT_MASK 0x000000001fffffffULL +#define DMA_28BIT_MASK 0x000000000fffffffULL#include <asm/dma-mapping.h>
sound/pci/ad1889.c +4 -3
@@ -34,6 +34,7 @@#include <linux/init.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/compiler.h>
@@ -909,10 +910,10 @@ snd_ad1889_create(struct snd_card *card,if ((err =pci_enable_device (pci)) <0 )return err; - +/* check PCI availability (32bit DMA) */ -if (pci_set_dma_mask (pci,0xffffffff ) <0 || -pci_set_consistent_dma_mask (pci,0xffffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_32BIT_MASK ) <0 || +pci_set_consistent_dma_mask (pci,DMA_32BIT_MASK ) <0 ) { printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");pci_disable_device (pci);return -ENXIO ;
sound/pci/emu10k1/emu10k1x.c +7 -6
@@ -33,6 +33,7 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/moduleparam.h> #include <sound/core.h>
@@ -893,24 +894,24 @@ static int __devinit snd_emu10k1x_createstatic struct snd_device_ops ops = { .dev_free = snd_emu10k1x_dev_free, }; - + *rchip =NULL ; - +if ((err =pci_enable_device (pci)) <0 )return err; -if (pci_set_dma_mask (pci,0x0fffffff ) <0 || -pci_set_consistent_dma_mask (pci,0x0fffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_28BIT_MASK ) <0 || +pci_set_consistent_dma_mask (pci,DMA_28BIT_MASK ) <0 ) {snd_printk (KERN_ERR "error to set 28bit mask DMA\n" );pci_disable_device (pci);return -ENXIO ; } - + chip =kzalloc (sizeof (*chip),GFP_KERNEL );if (chip ==NULL ) {pci_disable_device (pci);return -ENOMEM ; } - + chip->card = card; chip->pci = pci; chip->irq =-1 ;
sound/pci/es1968.c +3 -2
@@ -100,6 +100,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/gameport.h> #include <linux/moduleparam.h>
@@ -2559,8 +2560,8 @@ static int __devinit snd_es1968_create(sif ((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,0x0fffffff ) <0 || -pci_set_consistent_dma_mask (pci,0x0fffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_28BIT_MASK ) <0 || +pci_set_consistent_dma_mask (pci,DMA_28BIT_MASK ) <0 ) {snd_printk (KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n" );pci_disable_device (pci);return -ENXIO ;
sound/pci/ice1712/ice1712.c +3 -2
@@ -53,6 +53,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/moduleparam.h> #include <sound/core.h>
@@ -2538,8 +2539,8 @@ static int __devinit snd_ice1712_create(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,0x0fffffff ) <0 || -pci_set_consistent_dma_mask (pci,0x0fffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_28BIT_MASK ) <0 || +pci_set_consistent_dma_mask (pci,DMA_28BIT_MASK ) <0 ) {snd_printk (KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n" );pci_disable_device (pci);return -ENXIO ;
sound/pci/maestro3.c +3 -2
@@ -37,6 +37,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/moduleparam.h>
@@ -2657,8 +2658,8 @@ snd_m3_create(struct snd_card *card, strreturn -EIO ;/* check, if we can restrict PCI DMA transfers to 28 bits */ -if (pci_set_dma_mask (pci,0x0fffffff ) <0 || -pci_set_consistent_dma_mask (pci,0x0fffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_28BIT_MASK ) <0 || +pci_set_consistent_dma_mask (pci,DMA_28BIT_MASK ) <0 ) {snd_printk (KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n" );pci_disable_device (pci);return -ENXIO ;
sound/pci/mixart/mixart.c +2 -1
@@ -25,6 +25,7 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/moduleparam.h> #include <sound/core.h> #include <sound/initval.h>
@@ -1288,7 +1289,7 @@ static int __devinit snd_mixart_probe(stpci_set_master (pci);/* check if we can restrict PCI DMA transfers to 32 bits */ -if (pci_set_dma_mask (pci,0xffffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_32BIT_MASK ) <0 ) {snd_printk (KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n" );pci_disable_device (pci);return -ENXIO ;
sound/pci/pcxhr/pcxhr.c +2 -1
@@ -26,6 +26,7 @@#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/delay.h> #include <linux/moduleparam.h> #include <sound/core.h>
@@ -1215,7 +1216,7 @@ static int __devinit pcxhr_probe(structpci_set_master (pci);/* check if we can restrict PCI DMA transfers to 32 bits */ -if (pci_set_dma_mask (pci,0xffffffff ) <0 ) { +if (pci_set_dma_mask (pci,DMA_32BIT_MASK ) <0 ) {snd_printk (KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n" );pci_disable_device (pci);return -ENXIO ;
Signature · 1 line
1.2.3
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors