ASoC: core: remove artificial component and DAI name constraint (45dd9943) · Commits · 戴 / test

sound/soc/soc-core.c

+15 −18

Original line number	Diff line number	Diff line
		@@ -44,8 +44,6 @@
		#define CREATE_TRACE_POINTS
		#include <trace/events/asoc.h>

		#define NAME_SIZE 32

		static DEFINE_MUTEX(client_mutex);
		static LIST_HEAD(component_list);
		static LIST_HEAD(unbind_card_list);
		@@ -2231,13 +2229,14 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_card);
		*/
		static char fmt_single_name(struct device dev, int *id)
		{
		char *found, name[NAME_SIZE];
		const char *devname = dev_name(dev);
		char found, name;
		int id1, id2;

		if (dev_name(dev) == NULL)
		if (devname == NULL)
		return NULL;

		strlcpy(name, dev_name(dev), NAME_SIZE);
		name = devm_kstrdup(dev, devname, GFP_KERNEL);

		/* are we a "%s.%d" name (platform and SPI components) */
		found = strstr(name, dev->driver->name);
		@@ -2250,23 +2249,21 @@ static char fmt_single_name(struct device dev, int *id)
		found[strlen(dev->driver->name)] = '\0';
		}

		} else {
		/* I2C component devices are named "bus-addr" */
		if (sscanf(name, "%x-%x", &id1, &id2) == 2) {
		char tmp[NAME_SIZE];
		} else if (sscanf(name, "%x-%x", &id1, &id2) == 2) {

		/* create unique ID number from I2C addr and bus */
		*id = ((id1 & 0xffff) << 16) + id2;

		devm_kfree(dev, name);

		/* sanitize component name for DAI link creation */
		snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name,
		name);
		strlcpy(name, tmp, NAME_SIZE);
		} else
		name = devm_kasprintf(dev, GFP_KERNEL, "%s.%s", dev->driver->name, devname);
		} else {
		*id = 0;
		}

		return devm_kstrdup(dev, name, GFP_KERNEL);
		return name;
		}

		/*