Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2240f0d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c308abe4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
+3 −3
Original line number Diff line number Diff line
@@ -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 */
+2 −2
Original line number Diff line number Diff line
@@ -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 {