Commit a449e467 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: fsi: re-define fsi_is_play() and fsi_stream_is_play()

This patch re-define fsi_is_play() and fsi_stream_is_play().
fsi_data_pop/push() function keeps direct value of "is_play" at this point,
but it will be removed soon.
This is just prepare cleanup for DMAEngine support.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 95b0cf05
...@@ -296,6 +296,11 @@ static int fsi_is_spdif(struct fsi_priv *fsi) ...@@ -296,6 +296,11 @@ static int fsi_is_spdif(struct fsi_priv *fsi)
return fsi->spdif; return fsi->spdif;
} }
static int fsi_is_play(struct snd_pcm_substream *substream)
{
return substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
}
static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream) static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
...@@ -399,10 +404,10 @@ static void fsi_count_fifo_err(struct fsi_priv *fsi) ...@@ -399,10 +404,10 @@ static void fsi_count_fifo_err(struct fsi_priv *fsi)
/* /*
* fsi_stream_xx() function * fsi_stream_xx() function
*/ */
#define fsi_is_play(substream) fsi_stream_is_play(substream->stream) static inline int fsi_stream_is_play(struct fsi_priv *fsi,
static inline int fsi_stream_is_play(int stream) struct fsi_stream *io)
{ {
return stream == SNDRV_PCM_STREAM_PLAYBACK; return &fsi->playback == io;
} }
static inline struct fsi_stream *fsi_stream_get(struct fsi_priv *fsi, static inline struct fsi_stream *fsi_stream_get(struct fsi_priv *fsi,
...@@ -736,7 +741,7 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, struct fsi_stream *io, ...@@ -736,7 +741,7 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, struct fsi_stream *io,
static int fsi_data_pop(struct fsi_priv *fsi) static int fsi_data_pop(struct fsi_priv *fsi)
{ {
int is_play = fsi_stream_is_play(SNDRV_PCM_STREAM_CAPTURE); int is_play = 0;
int sample_residues; /* samples in FSI fifo */ int sample_residues; /* samples in FSI fifo */
int sample_space; /* ALSA free samples space */ int sample_space; /* ALSA free samples space */
int samples; int samples;
...@@ -755,7 +760,7 @@ static int fsi_data_pop(struct fsi_priv *fsi) ...@@ -755,7 +760,7 @@ static int fsi_data_pop(struct fsi_priv *fsi)
static int fsi_data_push(struct fsi_priv *fsi) static int fsi_data_push(struct fsi_priv *fsi)
{ {
int is_play = fsi_stream_is_play(SNDRV_PCM_STREAM_PLAYBACK); int is_play = 1;
int sample_residues; /* ALSA residue samples */ int sample_residues; /* ALSA residue samples */
int sample_space; /* FSI fifo free samples space */ int sample_space; /* FSI fifo free samples space */
int samples; int samples;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment