Commit b2354e40 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown

ASoC: core: ensure component names are unique

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: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20200214134704.342501-1-jbrunet@baylibre.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e37a0c31
...@@ -2446,6 +2446,33 @@ static int snd_soc_register_dais(struct snd_soc_component *component, ...@@ -2446,6 +2446,33 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
return ret; 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, static int snd_soc_component_initialize(struct snd_soc_component *component,
const struct snd_soc_component_driver *driver, struct device *dev) 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, ...@@ -2454,7 +2481,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
INIT_LIST_HEAD(&component->card_list); INIT_LIST_HEAD(&component->card_list);
mutex_init(&component->io_mutex); 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) { if (!component->name) {
dev_err(dev, "ASoC: Failed to allocate name\n"); dev_err(dev, "ASoC: Failed to allocate name\n");
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment