diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-13 01:34:08 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-26 21:24:11 +0100 |
commit | c0dea82c3c141c33ca22ca85f80e592028840864 (patch) | |
tree | 66aee355bba147c335bb30e04694fe003b53ced5 | |
parent | ALSA: AACI: clean up AACI announcement printk (diff) | |
download | linux-c0dea82c3c141c33ca22ca85f80e592028840864.tar.xz linux-c0dea82c3c141c33ca22ca85f80e592028840864.zip |
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>
-rw-r--r-- | sound/arm/aaci.c | 4 | ||||
-rw-r--r-- | sound/arm/aaci.h | 3 |
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) struct snd_pcm_runtime *runtime = substream->runtime; struct aaci_runtime *aacirun = runtime->private_data; + aacirun->period = snd_pcm_lib_period_bytes(substream); aacirun->start = runtime->dma_area; 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); + aacirun->bytes = aacirun->period; return 0; } 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 { u32 cr; struct snd_pcm_substream *substream; + unsigned int period; /* byte size of a "period" */ + /* * PIO support */ @@ -217,7 +219,6 @@ struct aaci_runtime { void *end; void *ptr; int bytes; - unsigned int period; unsigned int fifosz; }; |