Skip to contentSkip to conversation

AACI cleanup

PATCH In review Russell King - ARM Linux 2 participants 3 messages Nov 22, 2009 – Nov 23, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 AACI cleanup

Below is a patch which adds me to MAINTAINERS for this driver, and fixes the buffer size calculation to use the size which ALSA is expecting.

--
Please review carefully, since I am presently unable to run-time test changes to this driver due to incompatibilities system ABI.

 MAINTAINERS      |    5 +++++
 sound/arm/aaci.c |    7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
MAINTAINERS +5 -0
index c824b4d..dffb0c5 100644
@@ -512,6 +512,11 @@ W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/
 
+ARM PRIMECELL AACI PL041 DRIVER
+M:	Russell King <[email protected]>
+S:	Maintained
+F:	sound/arm/aaci.*
+
 ARM PRIMECELL MMCI PL180/1 DRIVER
 S:	Orphan
 F:	drivers/mmc/host/mmci.*
sound/arm/aaci.c +2 -5
index 1f0f821..a03fe80 100644
@@ -18,10 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/amba/bus.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/io.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -534,7 +531,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
 	struct aaci_runtime *aacirun = runtime->private_data;
 
 	aacirun->start	= (void *)runtime->dma_area;
-	aacirun->end	= aacirun->start + runtime->dma_bytes;
+	aacirun->end	= aacirun->start + snd_pcm_lib_buffer_bytes(substream);
 	aacirun->ptr	= aacirun->start;
 	aacirun->period	=
 	aacirun->bytes	= frames_to_bytes(runtime, runtime->period_size);
#1 lore raw

MAINTAINERS W: http://www.arm.linux.org.uk/ · line 519

Quoted 13 lines · Russell King - ARM Linux
MAINTAINERS +5 -0
index c824b4d..dffb0c5 100644
@@ -512,6 +512,11 @@ W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/
 
+ARM PRIMECELL AACI PL041 DRIVER
+M:	Russell King <[email protected]>
+S:	Maintained
+F:	sound/arm/aaci.*
+

2nd thought - I'll send this along with some other MAINTAINERS updates; please drop this section of this patch.

#2 lore raw

At Sun, 22 Nov 2009 17:41:39 +0000,

Quoted 10 lines · Russell King - ARM Linux
Quoted 8 lines · Russell King - ARM Linux
MAINTAINERS +0 -0
index c824b4d..dffb0c5 100644
@@ -512,6 +512,11 @@ W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/
 
Quoted 8 lines

MAINTAINERS W: http://www.arm.linux.org.uk/ · line 519

Quoted 5 lines
MAINTAINERS +5 -0
+ARM PRIMECELL AACI PL041 DRIVER
+M:	Russell King <[email protected]>
+S:	Maintained
+F:	sound/arm/aaci.*
+

2nd thought - I'll send this along with some other MAINTAINERS updates; please drop this section of this patch.

OK, I applied only the change of include files and the calculation of aacirun->end pointer.

thanks,

Takashi