aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-12 19:34:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-26 15:24:11 -0500
commitc0dea82c3c141c33ca22ca85f80e592028840864 (patch)
tree66aee355bba147c335bb30e04694fe003b53ced5 /sound/arm
parentf006d8fc53c461aa66a9265597494f83ddf4f53d (diff)
ALSA: AACI: use snd_pcm_lib_period_bytes()
Use the helper rather than open-coding this. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/aaci.c4
-rw-r--r--sound/arm/aaci.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 1e6d5f6591de..a8f95382a95a 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -541,11 +541,11 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
541 struct snd_pcm_runtime *runtime = substream->runtime; 541 struct snd_pcm_runtime *runtime = substream->runtime;
542 struct aaci_runtime *aacirun = runtime->private_data; 542 struct aaci_runtime *aacirun = runtime->private_data;
543 543
544 aacirun->period = snd_pcm_lib_period_bytes(substream);
544 aacirun->start = runtime->dma_area; 545 aacirun->start = runtime->dma_area;
545 aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream); 546 aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream);
546 aacirun->ptr = aacirun->start; 547 aacirun->ptr = aacirun->start;
547 aacirun->period = 548 aacirun->bytes = aacirun->period;
548 aacirun->bytes = frames_to_bytes(runtime, runtime->period_size);
549 549
550 return 0; 550 return 0;
551} 551}
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 04c4568413f4..198750d6871d 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -210,6 +210,8 @@ struct aaci_runtime {
210 u32 cr; 210 u32 cr;
211 struct snd_pcm_substream *substream; 211 struct snd_pcm_substream *substream;
212 212
213 unsigned int period; /* byte size of a "period" */
214
213 /* 215 /*
214 * PIO support 216 * PIO support
215 */ 217 */
@@ -217,7 +219,6 @@ struct aaci_runtime {
217 void *end; 219 void *end;
218 void *ptr; 220 void *ptr;
219 int bytes; 221 int bytes;
220 unsigned int period;
221 unsigned int fifosz; 222 unsigned int fifosz;
222}; 223};
223 224