ASoC: fsi: rename fsi_stream_push/pop() to fsi_stream_init/quit()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 3 Feb 2012 08:52:07 +0000 (00:52 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Feb 2012 11:55:39 +0000 (11:55 +0000)
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>
sound/soc/sh/fsi.c

index a0a9c367148f072bba966d5e80503f11f5d59d82..2e2663bb224cc254ef4cacfbe7b0a1e8d60bf0db 100644 (file)
@@ -426,7 +426,7 @@ static int fsi_stream_is_working(struct fsi_priv *fsi,
        return ret;
 }
 
-static void fsi_stream_push(struct fsi_priv *fsi,
+static void fsi_stream_init(struct fsi_priv *fsi,
                            int is_play,
                            struct snd_pcm_substream *substream)
 {
@@ -447,7 +447,7 @@ static void fsi_stream_push(struct fsi_priv *fsi,
        spin_unlock_irqrestore(&master->lock, flags);
 }
 
-static void fsi_stream_pop(struct fsi_priv *fsi, int is_play)
+static void fsi_stream_quit(struct fsi_priv *fsi, int is_play)
 {
        struct fsi_stream *io = fsi_stream_get(fsi, is_play);
        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,
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
-               fsi_stream_push(fsi, is_play, substream);
+               fsi_stream_init(fsi, is_play, substream);
                ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi);
                fsi_port_start(fsi, is_play);
                break;
        case SNDRV_PCM_TRIGGER_STOP:
                fsi_port_stop(fsi, is_play);
-               fsi_stream_pop(fsi, is_play);
+               fsi_stream_quit(fsi, is_play);
                break;
        }