ASoC: rsnd: rename RSND_DVC_CHANNELS to RSND_MAX_CHANNELS

The channels number is not only for DVC. Let's rename it.

Signed-off-by: Kuninori Morimoto <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 704ba7ae9eaf5a9f27d7880724f8c48fb72b1859..f86d62730614c31158a3e907239a632eff8011f7 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -988,7 +988,7 @@ int rsnd_kctrl_new_m(struct rsnd_mod *mod,
                     int ch_size,
                     u32 max)
 {
-       if (ch_size > RSND_DVC_CHANNELS)
+       if (ch_size > RSND_MAX_CHANNELS)
                return -EINVAL;
 
        _cfg->cfg.max   = max;

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 302c193f674d26fe6e5e4e23d00944525310c58c..d757f131638587cd90e11451a6a5e67adba93e87 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -83,15 +83,15 @@ static void rsnd_dvc_volume_parameter(struct rsnd_dai_stream *io,
                                              struct rsnd_mod *mod)
 {
        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
-       u32 val[RSND_DVC_CHANNELS];
+       u32 val[RSND_MAX_CHANNELS];
        int i;
 
        /* Enable Ramp */
        if (dvc->ren.val)
-               for (i = 0; i < RSND_DVC_CHANNELS; i++)
+               for (i = 0; i < RSND_MAX_CHANNELS; i++)
                        val[i] = dvc->volume.cfg.max;
        else
-               for (i = 0; i < RSND_DVC_CHANNELS; i++)
+               for (i = 0; i < RSND_MAX_CHANNELS; i++)
                        val[i] = dvc->volume.val[i];
 
        /* Enable Digital Volume */

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index bbaf89b6de8af100453a1cb12b08bb5b68b4fc47..61cb4aefdfd956bcc256784149728229119eb92c 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -550,10 +550,10 @@ struct rsnd_kctrl_cfg {
        struct snd_kcontrol *kctrl;
 };
 
-#define RSND_DVC_CHANNELS      8
+#define RSND_MAX_CHANNELS      8
 struct rsnd_kctrl_cfg_m {
        struct rsnd_kctrl_cfg cfg;
-       u32 val[RSND_DVC_CHANNELS];
+       u32 val[RSND_MAX_CHANNELS];
 };
 
 struct rsnd_kctrl_cfg_s {