diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2023-07-18 16:12:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-07-20 10:01:09 +0200 |
| commit | d8b366c40638d5aedad74646707b2b04b7342210 (patch) | |
| tree | 33e2e91e3c2bf0ad3fb2c99d9c801bd755e4d485 /sound/soc/atmel | |
| parent | staging: greybus: audio_helper: Use snd_ctl_remove_id() (diff) | |
| download | wireguard-linux-d8b366c40638d5aedad74646707b2b04b7342210.tar.xz wireguard-linux-d8b366c40638d5aedad74646707b2b04b7342210.zip | |
ASoC: atmel: mchp-pdmc: Use snd_ctl_remove_id()
Use the standard snd_ctl_remove_id() helper instead of open code for
removing a kctl. This helps for avoiding possible races.
Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230718141304.1032-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/mchp-pdmc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c79c73e6791e..1a069f4cdcda 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -386,7 +386,6 @@ static int mchp_pdmc_open(struct snd_soc_component *component, for (i = 0; i < ARRAY_SIZE(mchp_pdmc_snd_controls); i++) { const struct snd_kcontrol_new *control = &mchp_pdmc_snd_controls[i]; struct snd_ctl_elem_id id; - struct snd_kcontrol *kctl; int err; if (component->name_prefix) @@ -400,17 +399,10 @@ static int mchp_pdmc_open(struct snd_soc_component *component, id.device = control->device; id.subdevice = control->subdevice; id.index = control->index; - kctl = snd_ctl_find_id(component->card->snd_card, &id); - if (!kctl) { - dev_err(component->dev, "Failed to find %s\n", control->name); - continue; - } - err = snd_ctl_remove(component->card->snd_card, kctl); - if (err < 0) { + err = snd_ctl_remove_id(component->card->snd_card, &id); + if (err < 0) dev_err(component->dev, "%d: Failed to remove %s\n", err, control->name); - continue; - } } return 0; |