ASoC: Cleanup DAI module reference counting (ffbd7dd7) · Commits · 戴 / test

Currently when a DAI has no CODEC associated to it the reference on the module containing the DAI driver is increased when the DAI is probed and decrease when the DAI is removed. For DAIs with CODECs the module reference count was already incremented when the CODEC is probed. Now that all components have their module reference count incremented when they are probed and all DAIs do have a component it is possible to remove the module reference counting on DAI probe and removal. Signed-off-by:

Lars-Peter Clausen <lars@metafoo.de> Signed-off-by:

Mark Brown <broonie@linaro.org>

sound/soc/soc-core.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1067,8 +1067,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
		cpu_dai->name, err);
		}
		cpu_dai->probed = 0;
		if (!cpu_dai->codec)
		module_put(cpu_dai->dev->driver->owner);
		}
		}

		@@ -1422,18 +1420,12 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
		/* probe the cpu_dai */
		if (!cpu_dai->probed &&
		cpu_dai->driver->probe_order == order) {
		if (!cpu_dai->codec) {
		if (!try_module_get(cpu_dai->dev->driver->owner))
		return -ENODEV;
		}

		if (cpu_dai->driver->probe) {
		ret = cpu_dai->driver->probe(cpu_dai);
		if (ret < 0) {
		dev_err(cpu_dai->dev,
		"ASoC: failed to probe CPU DAI %s: %d\n",
		cpu_dai->name, ret);
		module_put(cpu_dai->dev->driver->owner);
		return ret;
		}
		}

Admin message