ASoC: dapm: Move stereo autodisable check

Tidy up the code a little, rather than repeating the check of
mc->autodisable move the stereo error check to be under the
existing if for mc->autodisable.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623105120.1981154-6-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 869c76506b669ca4f5ad18be57b54566983b9f8d..62c90e297aab938a44e9a314d4e55e73dbe1c900 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -368,14 +368,14 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
        case snd_soc_dapm_mixer_named_ctl:
                mc = (struct soc_mixer_control *)kcontrol->private_value;
 
-               if (mc->autodisable && snd_soc_volsw_is_stereo(mc))
-                       dev_warn(widget->dapm->dev,
-                                "ASoC: Unsupported stereo autodisable control '%s'\n",
-                                ctrl_name);
-
                if (mc->autodisable) {
                        struct snd_soc_dapm_widget template;
 
+                       if (snd_soc_volsw_is_stereo(mc))
+                               dev_warn(widget->dapm->dev,
+                                        "ASoC: Unsupported stereo autodisable control '%s'\n",
+                                        ctrl_name);
+
                        name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
                                         "Autodisable");
                        if (!name) {