[alsa-devel] [PATCH] 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.
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk -- 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(-)
diff --git a/MAINTAINERS b/MAINTAINERS index c824b4d..dffb0c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -512,6 +512,11 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/
+ARM PRIMECELL AACI PL041 DRIVER +M: Russell King linux@arm.linux.org.uk +S: Maintained +F: sound/arm/aaci.* + ARM PRIMECELL MMCI PL180/1 DRIVER S: Orphan F: drivers/mmc/host/mmci.* diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1f0f821..a03fe80 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -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);
On Sun, Nov 22, 2009 at 05:31:18PM +0000, Russell King - ARM Linux wrote:
diff --git a/MAINTAINERS b/MAINTAINERS index c824b4d..dffb0c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -512,6 +512,11 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/
+ARM PRIMECELL AACI PL041 DRIVER +M: Russell King linux@arm.linux.org.uk +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.
At Sun, 22 Nov 2009 17:41:39 +0000, Russell King - ARM Linux wrote:
On Sun, Nov 22, 2009 at 05:31:18PM +0000, Russell King - ARM Linux wrote:
diff --git a/MAINTAINERS b/MAINTAINERS index c824b4d..dffb0c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -512,6 +512,11 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/
+ARM PRIMECELL AACI PL041 DRIVER +M: Russell King linux@arm.linux.org.uk +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
participants (2)
-
Russell King - ARM Linux
-
Takashi Iwai