diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-02-03 00:55:26 -0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-03 11:55:39 +0000 |
commit | 7b1b3331e65e47b6abb32be0a3db46bcf423145a (patch) | |
tree | aff09fe5ad272e20d3c8beac8839b549f7d547cb /sound/soc/sh | |
parent | a449e46754616a13e1bee649e37bcdf10d1b794a (diff) | |
download | linux-7b1b3331e65e47b6abb32be0a3db46bcf423145a.tar.gz linux-7b1b3331e65e47b6abb32be0a3db46bcf423145a.tar.bz2 linux-7b1b3331e65e47b6abb32be0a3db46bcf423145a.zip |
ASoC: fsi: use fsi_stream in fsi_get_current_fifo_samples() parameter
fsi_get_current_fifo_samples() uses fsi_stream instead of is_play.
This is just prepare cleanup for DMAEngine support.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/fsi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 1cbe474046f0..24dbe165eda8 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -210,6 +210,8 @@ struct fsi_master { spinlock_t lock; }; +static int fsi_stream_is_play(struct fsi_priv *fsi, struct fsi_stream *io); + /* * basic read write function */ @@ -366,8 +368,10 @@ static int fsi_sample2frame(struct fsi_priv *fsi, int samples) return samples / fsi->chan_num; } -static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, int is_play) +static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, + struct fsi_stream *io) { + int is_play = fsi_stream_is_play(fsi, io); u32 status; int frames; @@ -747,7 +751,7 @@ static int fsi_data_pop(struct fsi_priv *fsi) int samples; struct fsi_stream *io = fsi_stream_get(fsi, is_play); - sample_residues = fsi_get_current_fifo_samples(fsi, is_play); + sample_residues = fsi_get_current_fifo_samples(fsi, io); sample_space = io->buff_sample_capa - io->buff_sample_pos; samples = min(sample_residues, sample_space); @@ -768,7 +772,7 @@ static int fsi_data_push(struct fsi_priv *fsi) sample_residues = io->buff_sample_capa - io->buff_sample_pos; sample_space = io->fifo_sample_capa - - fsi_get_current_fifo_samples(fsi, is_play); + fsi_get_current_fifo_samples(fsi, io); samples = min(sample_residues, sample_space); |