summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-component.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-08-09 12:42:31 +0200
committerTakashi Iwai <tiwai@suse.de>2024-08-09 14:24:55 +0200
commit9cacb32a0ba691c2859a20bd5e30b71cc592fad2 (patch)
tree0e3f610bab1655f9b7b7ab6735ebac07e39d0437 /sound/soc/soc-component.c
parentALSA: control: Optimize locking for look-up (diff)
downloadlinux-9cacb32a0ba691c2859a20bd5e30b71cc592fad2.tar.xz
linux-9cacb32a0ba691c2859a20bd5e30b71cc592fad2.zip
ASoC: Drop snd_soc_*_get_kcontrol_locked()
The recent cleanup in ALSA control core made no difference between snd_ctl_find_id_mixer() and snd_ctl_find_id_mixer_locked(), and the latter is to be dropped. The only user of the left API was ASoC, and that's snd_soc_card_get_kcontrol_locked() and snd_soc_component_get_kcontrol_locked(). This patch drops those functions and rewrites those users to call the variant without locked instead. The test of the API became superfluous, hence dropped as well. As all callers of snd_ctl_find_id_mixer_locked() are gone, snd_ctl_find_id_mixer_locked() is finally dropped, too. Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20240809104234.8488-4-tiwai@suse.de
Diffstat (limited to '')
-rw-r--r--sound/soc/soc-component.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 42f481321919..b3d7bb91e294 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -257,18 +257,6 @@ struct snd_kcontrol *snd_soc_component_get_kcontrol(struct snd_soc_component *co
}
EXPORT_SYMBOL_GPL(snd_soc_component_get_kcontrol);
-struct snd_kcontrol *
-snd_soc_component_get_kcontrol_locked(struct snd_soc_component *component,
- const char * const ctl)
-{
- char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-
- soc_get_kcontrol_name(component, name, ARRAY_SIZE(name), ctl);
-
- return snd_soc_card_get_kcontrol_locked(component->card, name);
-}
-EXPORT_SYMBOL_GPL(snd_soc_component_get_kcontrol_locked);
-
int snd_soc_component_notify_control(struct snd_soc_component *component,
const char * const ctl)
{