ASoC: rsnd: ssi: remove unnesessary period_pos

[linux-2.6-block.git] / sound / soc / sh / rcar / ssi.c

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index fece1e5f582f35ab5e558a0b66b3b558816048d6..f212024290009c8c47ea51e672ed33f2afd89b4a 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -80,7 +80,6 @@ struct rsnd_ssi {
        unsigned int usrcnt;
 
        int byte_pos;
-       int period_pos;
        int byte_per_period;
        int next_period_byte;
 };
@@ -421,7 +420,6 @@ static void rsnd_ssi_pointer_init(struct rsnd_mod *mod,
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
 
        ssi->byte_pos           = 0;
-       ssi->period_pos         = 0;
        ssi->byte_per_period    = runtime->period_size *
                                  runtime->channels *
                                  samples_to_bytes(runtime, 1);
@@ -446,25 +444,28 @@ static bool rsnd_ssi_pointer_update(struct rsnd_mod *mod,
                                    int byte)
 {
        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
+       bool ret = false;
+       int byte_pos;
 
-       ssi->byte_pos += byte;
+       byte_pos = ssi->byte_pos + byte;
 
-       if (ssi->byte_pos >= ssi->next_period_byte) {
+       if (byte_pos >= ssi->next_period_byte) {
                struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+               int period_pos = byte_pos / ssi->byte_per_period;
 
-               ssi->period_pos++;
-               ssi->next_period_byte += ssi->byte_per_period;
+               ssi->next_period_byte = (period_pos + 1) * ssi->byte_per_period;
 
-               if (ssi->period_pos >= runtime->periods) {
-                       ssi->byte_pos = 0;
-                       ssi->period_pos = 0;
+               if (period_pos >= runtime->periods) {
+                       byte_pos = 0;
                        ssi->next_period_byte = ssi->byte_per_period;
                }
 
-               return true;
+               ret = true;
        }
 
-       return false;
+       WRITE_ONCE(ssi->byte_pos, byte_pos);
+
+       return ret;
 }
 
 /*
@@ -838,7 +839,7 @@ static int rsnd_ssi_pointer(struct rsnd_mod *mod,
        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
 
-       *pointer = bytes_to_frames(runtime, ssi->byte_pos);
+       *pointer = bytes_to_frames(runtime, READ_ONCE(ssi->byte_pos));
 
        return 0;
 }