aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/fsi.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-02-03 03:52:07 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-03 06:55:39 -0500
commit8c4152951cab90b52406afc72b62e9590bbe2d85 (patch)
tree98df44832b5afd66ace43cba9283cc371a23fc44 /sound/soc/sh/fsi.c
parent41bba151939e21e21d18f7df005ce3a06714a69a (diff)
ASoC: fsi: rename fsi_stream_push/pop() to fsi_stream_init/quit()
This is preparation 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/fsi.c')
-rw-r--r--sound/soc/sh/fsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index a0a9c367148f..2e2663bb224c 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -426,7 +426,7 @@ static int fsi_stream_is_working(struct fsi_priv *fsi,
426 return ret; 426 return ret;
427} 427}
428 428
429static void fsi_stream_push(struct fsi_priv *fsi, 429static void fsi_stream_init(struct fsi_priv *fsi,
430 int is_play, 430 int is_play,
431 struct snd_pcm_substream *substream) 431 struct snd_pcm_substream *substream)
432{ 432{
@@ -447,7 +447,7 @@ static void fsi_stream_push(struct fsi_priv *fsi,
447 spin_unlock_irqrestore(&master->lock, flags); 447 spin_unlock_irqrestore(&master->lock, flags);
448} 448}
449 449
450static void fsi_stream_pop(struct fsi_priv *fsi, int is_play) 450static void fsi_stream_quit(struct fsi_priv *fsi, int is_play)
451{ 451{
452 struct fsi_stream *io = fsi_stream_get(fsi, is_play); 452 struct fsi_stream *io = fsi_stream_get(fsi, is_play);
453 struct snd_soc_dai *dai = fsi_get_dai(io->substream); 453 struct snd_soc_dai *dai = fsi_get_dai(io->substream);
@@ -960,13 +960,13 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
960 960
961 switch (cmd) { 961 switch (cmd) {
962 case SNDRV_PCM_TRIGGER_START: 962 case SNDRV_PCM_TRIGGER_START:
963 fsi_stream_push(fsi, is_play, substream); 963 fsi_stream_init(fsi, is_play, substream);
964 ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi); 964 ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi);
965 fsi_port_start(fsi, is_play); 965 fsi_port_start(fsi, is_play);
966 break; 966 break;
967 case SNDRV_PCM_TRIGGER_STOP: 967 case SNDRV_PCM_TRIGGER_STOP:
968 fsi_port_stop(fsi, is_play); 968 fsi_port_stop(fsi, is_play);
969 fsi_stream_pop(fsi, is_play); 969 fsi_stream_quit(fsi, is_play);
970 break; 970 break;
971 } 971 }
972 972