mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
	broonie@kernel.org
Cc: tiwai@suse.com, enric.balletbo@collabora.com,
	kernel@collabora.com, dafna3@gmail.com, lgirdwood@gmail.com,
	perex@perex.cz, linux-mediatek@lists.infradead.org,
	ranjani.sridharan@linux.intel.com, matthias.bgg@gmail.com,
	dmitry.baryshkov@linaro.org,
	Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Subject: [PATCH] ASoC: core: Optionaly add the component driver name to the component name
Date: Thu, 10 Sep 2020 22:03:08 +0200	[thread overview]
Message-ID: <20200910200308.9125-1-dafna.hirschfeld@collabora.com> (raw)

The ASoC platform driver for Mediatek MT8173 registers
several components with identical name. This cause an
error:
"Directory '11220000.audio-controller' with parent 'mtk-rt5650' already present!"
when adding debugfs directory for those components.
To fix this, the function 'fmt_single_name' can receive the name
of the component driver and concatenate it to the name of the debugfs
directory for the component.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
 sound/soc/soc-core.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 74df22486e30..f470e713b030 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2227,7 +2227,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_card);
  * Simplify DAI link configuration by removing ".-1" from device names
  * and sanitizing names.
  */
-static char *fmt_single_name(struct device *dev, int *id)
+static char *fmt_single_name(struct device *dev, int *id, const char *component_driver_name)
 {
 	const char *devname = dev_name(dev);
 	char *found, *name;
@@ -2263,6 +2263,12 @@ static char *fmt_single_name(struct device *dev, int *id)
 		*id = 0;
 	}
 
+	if (component_driver_name) {
+		char *tmp = name;
+
+		name = devm_kasprintf(dev, GFP_KERNEL, "%s-%s", name, component_driver_name);
+		devm_kfree(dev, tmp);
+	}
 	return name;
 }
 
@@ -2327,7 +2333,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
 	 */
 	if (legacy_dai_naming &&
 	    (dai_drv->id == 0 || dai_drv->name == NULL)) {
-		dai->name = fmt_single_name(dev, &dai->id);
+		dai->name = fmt_single_name(dev, &dai->id, NULL);
 	} else {
 		dai->name = fmt_multiple_name(dev, dai_drv);
 		if (dai_drv->id)
@@ -2460,7 +2466,7 @@ 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 = fmt_single_name(dev, &component->id, driver->name);
 	if (!component->name) {
 		dev_err(dev, "ASoC: Failed to allocate name\n");
 		return -ENOMEM;
-- 
2.17.1


             reply	other threads:[~2020-09-10 20:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-10 20:03 Dafna Hirschfeld [this message]
2020-09-11 10:14 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200910200308.9125-1-dafna.hirschfeld@collabora.com \
    --to=dafna.hirschfeld@collabora.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=dafna3@gmail.com \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=enric.balletbo@collabora.com \
    --cc=kernel@collabora.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=perex@perex.cz \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®