From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com>
Cc: <lgirdwood@gmail.com>, <linux-sound@vger.kernel.org>,
<patches@opensource.cirrus.com>
Subject: [PATCH v3 3/4] ASoC: cs35l45: Use new snd_soc_component_get_kcontrol() helper
Date: Thu, 1 Aug 2024 11:04:12 +0100 [thread overview]
Message-ID: <20240801100413.1620481-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20240801100413.1620481-1-ckeepax@opensource.cirrus.com>
No longer any need to hard code the addition of the name prefix, use the
new helper.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
No change since v2.
Thanks,
Charles
sound/soc/codecs/cs35l45.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c
index 2392c6effed85..1fefdb80d758c 100644
--- a/sound/soc/codecs/cs35l45.c
+++ b/sound/soc/codecs/cs35l45.c
@@ -176,17 +176,10 @@ static int cs35l45_activate_ctl(struct snd_soc_component *component,
struct snd_kcontrol *kcontrol;
struct snd_kcontrol_volatile *vd;
unsigned int index_offset;
- char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
- if (component->name_prefix)
- snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s %s",
- component->name_prefix, ctl_name);
- else
- snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s", ctl_name);
-
- kcontrol = snd_soc_card_get_kcontrol_locked(component->card, name);
+ kcontrol = snd_soc_component_get_kcontrol_locked(component->card, ctl_name);
if (!kcontrol) {
- dev_err(component->dev, "Can't find kcontrol %s\n", name);
+ dev_err(component->dev, "Can't find kcontrol %s\n", ctl_name);
return -EINVAL;
}
--
2.39.2
next prev parent reply other threads:[~2024-08-01 10:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 10:04 [PATCH v3 1/4] ASoC: cs42l43: Remove redundant semi-colon at end of function Charles Keepax
2024-08-01 10:04 ` [PATCH v3 2/4] ASoC: soc-component: Add new snd_soc_component_get_kcontrol() helper Charles Keepax
2024-08-01 10:04 ` Charles Keepax [this message]
2024-08-01 16:38 ` [PATCH v3 3/4] ASoC: cs35l45: Use " Mark Brown
2024-08-02 8:44 ` Charles Keepax
2024-08-01 10:04 ` [PATCH v3 4/4] ASoC: cs42l43: Cache shutter IRQ control pointers Charles Keepax
2024-08-02 22:28 ` [PATCH v3 1/4] ASoC: cs42l43: Remove redundant semi-colon at end of function 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=20240801100413.1620481-3-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.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