From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: <james.schulman@cirrus.com>, <david.rhodes@cirrus.com>,
<lgirdwood@gmail.com>, <alsa-devel@alsa-project.org>,
<patches@opensource.cirrus.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 6/6] ASoC: dapm: Move stereo autodisable check
Date: Thu, 23 Jun 2022 11:51:20 +0100 [thread overview]
Message-ID: <20220623105120.1981154-6-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20220623105120.1981154-1-ckeepax@opensource.cirrus.com>
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>
---
sound/soc/soc-dapm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index a8e842e02cdc2..b05231414c1d0 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -370,14 +370,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) {
--
2.30.2
next prev parent reply other threads:[~2022-06-23 10:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 10:51 [PATCH 1/6] ASoC: dapm: Initialise kcontrol data for mux/demux controls Charles Keepax
2022-06-23 10:51 ` [PATCH 2/6] ASoC: cs35l41: Add ASP TX3/4 source to register patch Charles Keepax
2022-06-23 10:51 ` [PATCH 3/6] ASoC: cs47l15: Fix event generation for low power mux control Charles Keepax
2022-06-23 10:51 ` [PATCH 4/6] ASoC: madera: Fix event generation for OUT1 demux Charles Keepax
2022-06-23 10:51 ` [PATCH 5/6] ASoC: madera: Fix event generation for rate controls Charles Keepax
2022-06-23 10:51 ` Charles Keepax [this message]
2022-06-23 13:58 ` (subset) [PATCH 1/6] ASoC: dapm: Initialise kcontrol data for mux/demux controls Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623105120.1981154-6-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=david.rhodes@cirrus.com \
--cc=james.schulman@cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®