Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / sound / soc / sh / rcar / dvc.c

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 024ece46bf685afe381a8594b04e6e48c03f7616..8d91c0eb0880f17eb627bb946934b158fa3fd033 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -86,14 +86,8 @@ static void rsnd_dvc_volume_parameter(struct rsnd_dai_stream *io,
                        val[i] = rsnd_kctrl_valm(dvc->volume, i);
 
        /* Enable Digital Volume */
-       rsnd_mod_write(mod, DVC_VOL0R, val[0]);
-       rsnd_mod_write(mod, DVC_VOL1R, val[1]);
-       rsnd_mod_write(mod, DVC_VOL2R, val[2]);
-       rsnd_mod_write(mod, DVC_VOL3R, val[3]);
-       rsnd_mod_write(mod, DVC_VOL4R, val[4]);
-       rsnd_mod_write(mod, DVC_VOL5R, val[5]);
-       rsnd_mod_write(mod, DVC_VOL6R, val[6]);
-       rsnd_mod_write(mod, DVC_VOL7R, val[7]);
+       for (i = 0; i < RSND_MAX_CHANNELS; i++)
+               rsnd_mod_write(mod, DVC_VOLxR(i), val[i]);
 }
 
 static void rsnd_dvc_volume_init(struct rsnd_dai_stream *io,
@@ -298,6 +292,7 @@ static struct rsnd_mod_ops rsnd_dvc_ops = {
        .init           = rsnd_dvc_init,
        .quit           = rsnd_dvc_quit,
        .pcm_new        = rsnd_dvc_pcm_new,
+       .get_status     = rsnd_mod_get_status,
 };
 
 struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id)
@@ -357,7 +352,7 @@ int rsnd_dvc_probe(struct rsnd_priv *priv)
                }
 
                ret = rsnd_mod_init(priv, rsnd_mod_get(dvc), &rsnd_dvc_ops,
-                                   clk, rsnd_mod_get_status, RSND_MOD_DVC, i);
+                                   clk, RSND_MOD_DVC, i);
                if (ret) {
                        of_node_put(np);
                        goto rsnd_dvc_probe_done;