Unverified Commit b833b412 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: tidyup snd_soc_lookup_component_nolocked() 



snd_soc_lookup_component_nolocked() is very complex today.
Let's tidyup the code.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Message-ID: <87cy8sysuy.wl-kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 168873ca

sound/soc/soc-core.c

+15 −11
Original line number Diff line number Diff line
@@ -369,21 +369,25 @@ struct snd_soc_component 
*snd_soc_lookup_component_nolocked(struct device *dev, const char *driver_name)

{

	struct snd_soc_component *component;

	struct snd_soc_component *found_component;



	found_component = NULL;

	for_each_component(component) {

		if ((dev == component->dev) &&

		    (!driver_name ||

		     (component->driver->name &&

		      ((component->driver->name == driver_name) ||

		       (strcmp(component->driver->name, driver_name) == 0))))) {

			found_component = component;

			break;

		}

		if (dev != component->dev)

			continue;



		if (!driver_name)

			return component;



		if (!component->driver->name)

			continue;



		if (component->driver->name == driver_name)

			return component;



		if (strcmp(component->driver->name, driver_name) == 0)

			return component;

	}



	return found_component;

	return NULL;

}

EXPORT_SYMBOL_GPL(snd_soc_lookup_component_nolocked);