ASoC: Use snd_ctl_find_id_mixer() instead of open-coding
cover ASoC: Use snd_ctl_find_id_mixer() instead of open-coding
The first two patches change snd_soc_card_get_kcontrol() to use the core snd_ctl_find_id_mixer() functionality instead of open-coding its own list walk.
The last patch adds a KUnit test for this, which was tested on the original and modified code.
Richard Fitzgerald (3):
ALSA: control: Introduce snd_ctl_find_id_mixer_locked()
ASoC: soc-card: Use snd_ctl_find_id_mixer() instead of open-coding
ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol
include/sound/control.h | 23 +++++ sound/soc/Kconfig | 8 ++ sound/soc/Makefile | 4 + sound/soc/soc-card-test.c | 191 ++++++++++++++++++++++++++++++++++++++ sound/soc/soc-card.c | 21 +---- 5 files changed, 230 insertions(+), 17 deletions(-) create mode 100644 sound/soc/soc-card-test.c
Signature · 1 line
2.39.2
PATCH 1/3 ALSA: control: Introduce snd_ctl_find_id_mixer_locked()
Adds wrapper function snd_ctl_find_id_mixer_locked(). This is identical to snd_ctl_find_id_mixer() except that it can be called from code that is already holding controls_rwsem.
--- include/sound/control.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
include/sound/control.h +23 -0
@@ -167,6 +167,29 @@ snd_ctl_find_id_mixer(struct snd_card *card, const char *name)return snd_ctl_find_id (card, &id); } +/** +* snd_ctl_find_id_mixer_locked - find the control instance with the given name string +* @card: the card instance +* @name: the name string +* +* Finds the control instance with the given name and +* @SNDRV_CTL_ELEM_IFACE_MIXER. Other fields are set to zero. +* +* This is merely a wrapper to snd_ctl_find_id_locked(). +* The caller must down card->controls_rwsem before calling this function. +* +* Return: The pointer of the instance if found, or %NULL if not. +*/ +static inline struct snd_kcontrol * +snd_ctl_find_id_mixer_locked (struct snd_card *card,const char *name) +{ +struct snd_ctl_elem_id id = {}; + + id.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; +strscpy (id.name, name,sizeof (id.name)); +return snd_ctl_find_id_locked (card, &id); +} +int snd_ctl_create (struct snd_card *card);int snd_ctl_register_ioctl (snd_kctl_ioctl_func_t fcn);
Signature · 1 line
2.39.2
PATCH 2/3 ASoC: soc-card: Use snd_ctl_find_id_mixer() instead of open-coding
In reply to Richard FitzgeraldUse the snd_ctl_find_id_mixer[_locked]() wrapper in snd_soc_card_get_kcontrol[_locked]() instead of open-coding a custom list walk of the card controls list.
--- sound/soc/soc-card.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
sound/soc/soc-card.c +4 -17
@@ -32,33 +32,20 @@ static inline int _soc_card_ret(struct snd_soc_card *card,struct snd_kcontrol *snd_soc_card_get_kcontrol_locked (struct snd_soc_card *soc_card,const char *name) { -struct snd_card *card = soc_card->snd_card; -struct snd_kcontrol *kctl; - -/* must be held read or write */ -lockdep_assert_held (&card->controls_rwsem); -if (unlikely (!name))return NULL ; -list_for_each_entry (kctl, &card->controls, list) -if (!strncmp (kctl->id.name, name,sizeof (kctl->id.name))) -return kctl; -return NULL ; +return snd_ctl_find_id_mixer_locked (soc_card->snd_card, name); }EXPORT_SYMBOL_GPL (snd_soc_card_get_kcontrol_locked);struct snd_kcontrol *snd_soc_card_get_kcontrol (struct snd_soc_card *soc_card,const char *name) { -struct snd_card *card = soc_card->snd_card; -struct snd_kcontrol *kctl; - -down_read (&card->controls_rwsem); - kctl =snd_soc_card_get_kcontrol_locked (soc_card, name); -up_read (&card->controls_rwsem); +if (unlikely (!name)) +return NULL ; -return kctl; +return snd_ctl_find_id_mixer (soc_card->snd_card, name); }EXPORT_SYMBOL_GPL (snd_soc_card_get_kcontrol);
Signature · 1 line
2.39.2
PATCH 3/3 ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol
In reply to Richard FitzgeraldAdd a new snd-soc-card KUnit test with a simple test case for snd_soc_card_get_kcontrol() and snd_soc_card_get_kcontrol_locked().
--- sound/soc/Kconfig | 8 ++ sound/soc/Makefile | 4 + sound/soc/soc-card-test.c | 191 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 203 insertions(+) create mode 100644 sound/soc/soc-card-test.c
sound/soc/Kconfig +8 -0
@@ -66,6 +66,14 @@ config SND_SOC_TOPOLOGY_KUNIT_TEST userspace applications such as pulseaudio, to prevent unnecessary problems. +config SND_SOC_CARD_KUNIT_TEST + tristate "KUnit tests for SoC card" + depends on KUNIT + default KUNIT_ALL_TESTS + help + If you want to perform tests on ALSA SoC card functions say Y here. + If unsure, say N. + config SND_SOC_UTILS_KUNIT_TEST tristate "KUnit tests for SoC utils" depends on KUNIT
sound/soc/Makefile +4 -0
@@ -12,6 +12,10 @@ ifneq ($(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST),) obj-$(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST) += soc-topology-test.o endif +ifneq ($(CONFIG_SND_SOC_CARD_KUNIT_TEST),) +obj-$(CONFIG_SND_SOC_CARD_KUNIT_TEST) += soc-card-test.o +endif + ifneq ($(CONFIG_SND_SOC_UTILS_KUNIT_TEST),) # snd-soc-test-objs := soc-utils-test.o obj-$(CONFIG_SND_SOC_UTILS_KUNIT_TEST) += soc-utils-test.o
sound/soc/soc-card-test.c new file +191 -0
191 lines not on this page · raw message
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH 3/3] ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol
kernel test robot noticed the following build errors:
Hi Richard,
kernel test robot noticed the following build errors:
[auto build test ERROR on broonie-sound/for-next]
[also build test ERROR on tiwai-sound/for-next tiwai-sound/for-linus linus/master v6.9-rc1 next-20240328] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Richard-Fitzgerald/ALSA-control-Introduce-snd_ctl_find_id_mixer_locked/20240325-210026 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/20240325125650.213913-4-rf%40opensource.cirrus.com patch subject: [PATCH 3/3] ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol config: powerpc-randconfig-r081-20240328 (https://download.01.org/0day-ci/archive/20240328/[email protected]/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240328/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> sound/soc/soc-card-test.c:24:13: error: initializer element is not a compile-time constant
SOC_SINGLE(test_control_names[0], SND_SOC_NOPM, 0, 1, 0),
^~~~~~~~~~~~~~~~~~~~~
include/sound/soc.h:61:48: note: expanded from macro 'SOC_SINGLE'
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
^~~~~1 error generated.
vim +24 sound/soc/soc-card-test.c
22
23 static const struct snd_kcontrol_new test_card_controls[] = {
> 24 SOC_SINGLE(test_control_names[0], SND_SOC_NOPM, 0, 1, 0),
25 SOC_SINGLE(test_control_names[1], SND_SOC_NOPM, 1, 1, 0),
26 SOC_SINGLE(test_control_names[2], SND_SOC_NOPM, 2, 1, 0),
27 SOC_SINGLE(test_control_names[3], SND_SOC_NOPM, 3, 1, 0),
28 SOC_SINGLE(test_control_names[4], SND_SOC_NOPM, 4, 1, 0),
29 SOC_SINGLE(test_control_names[5], SND_SOC_NOPM, 5, 1, 0),
30 SOC_SINGLE(test_control_names[6], SND_SOC_NOPM, 6, 1, 0),
31 SOC_SINGLE(test_control_names[7], SND_SOC_NOPM, 7, 1, 0),
32 SOC_SINGLE(test_control_names[8], SND_SOC_NOPM, 8, 1, 0),
33 SOC_SINGLE(test_control_names[9], SND_SOC_NOPM, 9, 1, 0),
34 SOC_SINGLE(test_control_names[10], SND_SOC_NOPM, 10, 1, 0),
35 SOC_SINGLE(test_control_names[11], SND_SOC_NOPM, 11, 1, 0),
36 };
37 static_assert(ARRAY_SIZE(test_control_names) == ARRAY_SIZE(test_card_controls));
38 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki