diff options
Diffstat (limited to 'patches.kzm9g/0108-ASoC-fsi-re-define-fsi_is_play-and-fsi_stream_is_pla.patch')
-rw-r--r-- | patches.kzm9g/0108-ASoC-fsi-re-define-fsi_is_play-and-fsi_stream_is_pla.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/patches.kzm9g/0108-ASoC-fsi-re-define-fsi_is_play-and-fsi_stream_is_pla.patch b/patches.kzm9g/0108-ASoC-fsi-re-define-fsi_is_play-and-fsi_stream_is_pla.patch deleted file mode 100644 index c284e895279f66..00000000000000 --- a/patches.kzm9g/0108-ASoC-fsi-re-define-fsi_is_play-and-fsi_stream_is_pla.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3e44f2caa7c0f3ce9496d578f1fea695c5e5646f Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Fri, 3 Feb 2012 00:54:02 -0800 -Subject: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> -(cherry picked from commit a449e46754616a13e1bee649e37bcdf10d1b794a) - -Signed-off-by: Simon Horman <horms@verge.net.au> ---- - sound/soc/sh/fsi.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c -index c814d8a..1cbe474 100644 ---- a/sound/soc/sh/fsi.c -+++ b/sound/soc/sh/fsi.c -@@ -296,6 +296,11 @@ static int fsi_is_spdif(struct fsi_priv *fsi) - 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) - { - struct snd_soc_pcm_runtime *rtd = substream->private_data; -@@ -399,10 +404,10 @@ static void fsi_count_fifo_err(struct fsi_priv *fsi) - /* - * fsi_stream_xx() function - */ --#define fsi_is_play(substream) fsi_stream_is_play(substream->stream) --static inline int fsi_stream_is_play(int stream) -+static inline int fsi_stream_is_play(struct fsi_priv *fsi, -+ 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, -@@ -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) - { -- int is_play = fsi_stream_is_play(SNDRV_PCM_STREAM_CAPTURE); -+ int is_play = 0; - int sample_residues; /* samples in FSI fifo */ - int sample_space; /* ALSA free samples space */ - int samples; -@@ -755,7 +760,7 @@ static int fsi_data_pop(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_space; /* FSI fifo free samples space */ - int samples; --- -1.7.10.2.565.gbd578b5 - |