ASoC: rsnd: tidyup registering method for rsnd_kctrl_new() (9c698e84) · Commits · 戴 / test

Current rsnd dvc.c is using flags to avoid duplicating register for MIXer case. OTOH, commit ("ASoC: core: add support to card rebind") allows to rebind sound card without rebinding all drivers. Because of above patch and dvc.c flags, it can't re-register kctrl if only sound card was rebinded, because dvc is keeping old flags. (Of course it will be no problem if rsnd driver also be rebinded, but it is not purpose of above patch). This patch checks current card registered kctrl when registering. In MIXer case, it can avoid duplicate register if card already has same kctrl. In rebind case, it can re-register kctrl because card registered kctl had been removed when unbinding. This patch is updated version of commit ("ASoC: rsnd: DVC kctrl sets once") Reported-by:

Nguyen Viet Dung <dung.nguyen.aj@renesas.com> Signed-off-by:

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by:

Nguyen Viet Dung <dung.nguyen.aj@renesas.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/sh/rcar/core.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -1339,6 +1339,18 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
		};
		int ret;

		/*
		* 1) Avoid duplicate register (ex. MIXer case)
		* 2) re-register if card was rebinded
		*/
		list_for_each_entry(kctrl, &card->controls, list) {
		struct rsnd_kctrl_cfg *c = kctrl->private_data;

		if (strcmp(kctrl->id.name, name) == 0 &&
		c->mod == mod)
		return 0;
		}

		if (size > RSND_MAX_CHANNELS)
		return -EINVAL;

sound/soc/sh/rcar/dvc.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -40,11 +40,8 @@ struct rsnd_dvc {
		struct rsnd_kctrl_cfg_s ren; /* Ramp Enable */
		struct rsnd_kctrl_cfg_s rup; /* Ramp Rate Up */
		struct rsnd_kctrl_cfg_s rdown; /* Ramp Rate Down */
		u32 flags;
		};

		#define KCTRL_INITIALIZED (1 << 0)

		#define rsnd_dvc_get(priv, id) ((struct rsnd_dvc *)(priv->dvc) + id)
		#define rsnd_dvc_nr(priv) ((priv)->dvc_nr)

		@@ -227,9 +224,6 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
		int channels = rsnd_rdai_channels_get(rdai);
		int ret;

		if (rsnd_flags_has(dvc, KCTRL_INITIALIZED))
		return 0;

		/* Volume */
		ret = rsnd_kctrl_new_m(mod, io, rtd,
		is_play ?
		@@ -285,8 +279,6 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
		if (ret < 0)
		return ret;

		rsnd_flags_set(dvc, KCTRL_INITIALIZED);

		return 0;
		}

Admin message