ASoC: core: ensure component names are unique (b2354e40) · Commits · 戴 / test

Make sure each ASoC component is registered with a unique name. The component is derived from the device name. If a device registers more than one component, the component names will be the same. This usually brings up a warning about the debugfs directory creation of the component since directory already exists. In such case, start numbering the component of the device so the names don't collide anymore. Signed-off-by:

Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20200214134704.342501-1-jbrunet@baylibre.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/soc-core.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -2446,6 +2446,33 @@ err:
		return ret;
		}

		static char snd_soc_component_unique_name(struct device dev,
		struct snd_soc_component *component)
		{
		struct snd_soc_component *pos;
		int count = 0;
		char name, unique;

		name = fmt_single_name(dev, &component->id);
		if (!name)
		return name;

		/* Count the number of components registred by the device */
		for_each_component(pos) {
		if (dev == pos->dev)
		count++;
		}

		/* Keep naming as it is for the 1st component */
		if (!count)
		return name;

		unique = devm_kasprintf(dev, GFP_KERNEL, "%s-%d", name, count);
		devm_kfree(dev, name);

		return unique;
		}

		static int snd_soc_component_initialize(struct snd_soc_component *component,
		const struct snd_soc_component_driver driver, struct device dev)
		{
		@@ -2454,7 +2481,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
		INIT_LIST_HEAD(&component->card_list);
		mutex_init(&component->io_mutex);

		component->name = fmt_single_name(dev, &component->id);
		component->name = snd_soc_component_unique_name(dev, component);
		if (!component->name) {
		dev_err(dev, "ASoC: Failed to allocate name\n");
		return -ENOMEM;

Admin message