Skip to content

Commit

Permalink
ASoC: fsi: use fsi_stream in fsi_get_current_fifo_samples() parameter
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Feb 3, 2012
1 parent a449e46 commit 7b1b333
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand All @@ -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);

Expand Down

0 comments on commit 7b1b333

Please sign in to comment.