redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: sh: fsi: tidyup parameter of fsi_stream_push

Browse source 
It is possible to create buff_len and period_len
from substream->runtime.
This patch is preparation of tidyup unclear variable naming patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2011-05-23 20:45:57 +09:00 committed by Mark Brown
parent 60c655e62f
commit 0ffe296add
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/sh/fsi.c
View file

@ -344,16 +344,15 @@ static u32 fsi_get_port_shift(struct fsi_priv *fsi, int is_play)
static void fsi_stream_push(struct fsi_priv *fsi, static void fsi_stream_push(struct fsi_priv *fsi,
int is_play, int is_play,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream)
u32 buffer_len,
u32 period_len)
{ {
struct fsi_stream *io = fsi_get_stream(fsi, is_play); struct fsi_stream *io = fsi_get_stream(fsi, is_play);
struct snd_pcm_runtime *runtime = substream->runtime;
io->substream = substream; io->substream = substream;
io->buff_len = buffer_len; io->buff_len = frames_to_bytes(runtime, runtime->buffer_size);
io->buff_offset = 0; io->buff_offset = 0;
io->period_len = period_len; io->period_len = frames_to_bytes(runtime, runtime->period_size);
io->period_num = 0; io->period_num = 0;
io->oerr_num = -1; /* ignore 1st err */ io->oerr_num = -1; /* ignore 1st err */
io->uerr_num = -1; /* ignore 1st err */ io->uerr_num = -1; /* ignore 1st err */
@ -844,15 +843,12 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct fsi_priv *fsi = fsi_get_priv(substream); struct fsi_priv *fsi = fsi_get_priv(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
int is_play = fsi_is_play(substream); int is_play = fsi_is_play(substream);
int ret = 0; int ret = 0;
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
fsi_stream_push(fsi, is_play, substream, fsi_stream_push(fsi, is_play, substream);
frames_to_bytes(runtime, runtime->buffer_size),
frames_to_bytes(runtime, runtime->period_size));
ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi); ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi);
fsi_irq_enable(fsi, is_play); fsi_irq_enable(fsi, is_play);
fsi_port_start(fsi); fsi_port_start(fsi);