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

ASoC: soc-core: rename "cmpnt" to "component" 



To unify notation, to readable.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5771a8c0

include/sound/soc.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -469,10 +469,10 @@ int snd_soc_register_codec(struct device *dev, 
		struct snd_soc_dai_driver *dai_drv, int num_dai);

		struct snd_soc_dai_driver *dai_drv, int num_dai);

void snd_soc_unregister_codec(struct device *dev);

void snd_soc_unregister_codec(struct device *dev);

int snd_soc_register_component(struct device *dev,

int snd_soc_register_component(struct device *dev,

			 const struct snd_soc_component_driver *cmpnt_drv,

			 const struct snd_soc_component_driver *component_driver,

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

int devm_snd_soc_register_component(struct device *dev,

int devm_snd_soc_register_component(struct device *dev,

			 const struct snd_soc_component_driver *cmpnt_drv,

			 const struct snd_soc_component_driver *component_driver,

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

void snd_soc_unregister_component(struct device *dev);

void snd_soc_unregister_component(struct device *dev);

int snd_soc_cache_init(struct snd_soc_codec *codec);

int snd_soc_cache_init(struct snd_soc_codec *codec);

sound/soc/soc-core.c

+18 −18
Original line number Original line Diff line number Diff line
@@ -3282,40 +3282,40 @@ static void snd_soc_component_del_unlocked(struct snd_soc_component *component) 
}

}





int snd_soc_register_component(struct device *dev,

int snd_soc_register_component(struct device *dev,

			       const struct snd_soc_component_driver *cmpnt_drv,

			       const struct snd_soc_component_driver *component_driver,

			       struct snd_soc_dai_driver *dai_drv,

			       struct snd_soc_dai_driver *dai_drv,

			       int num_dai)

			       int num_dai)

{

{

	struct snd_soc_component *cmpnt;

	struct snd_soc_component *component;

	int ret;

	int ret;





	cmpnt = kzalloc(sizeof(*cmpnt), GFP_KERNEL);

	component = kzalloc(sizeof(*component), GFP_KERNEL);

	if (!cmpnt) {

	if (!component) {

		dev_err(dev, "ASoC: Failed to allocate memory\n");

		dev_err(dev, "ASoC: Failed to allocate memory\n");

		return -ENOMEM;

		return -ENOMEM;

	}

	}





	ret = snd_soc_component_initialize(cmpnt, cmpnt_drv, dev);

	ret = snd_soc_component_initialize(component, component_driver, dev);

	if (ret)

	if (ret)

		goto err_free;

		goto err_free;





	cmpnt->ignore_pmdown_time = true;

	component->ignore_pmdown_time = true;

	cmpnt->registered_as_component = true;

	component->registered_as_component = true;





	ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true);

	ret = snd_soc_register_dais(component, dai_drv, num_dai, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret);

		dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret);

		goto err_cleanup;

		goto err_cleanup;

	}

	}





	snd_soc_component_add(cmpnt);

	snd_soc_component_add(component);





	return 0;

	return 0;





err_cleanup:

err_cleanup:

	snd_soc_component_cleanup(cmpnt);

	snd_soc_component_cleanup(component);

err_free:

err_free:

	kfree(cmpnt);

	kfree(component);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(snd_soc_register_component);

EXPORT_SYMBOL_GPL(snd_soc_register_component);
@@ -3327,22 +3327,22 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component); 
 */

 */

void snd_soc_unregister_component(struct device *dev)

void snd_soc_unregister_component(struct device *dev)

{

{

	struct snd_soc_component *cmpnt;

	struct snd_soc_component *component;





	mutex_lock(&client_mutex);

	mutex_lock(&client_mutex);

	list_for_each_entry(cmpnt, &component_list, list) {

	list_for_each_entry(component, &component_list, list) {

		if (dev == cmpnt->dev && cmpnt->registered_as_component)

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

			goto found;

			goto found;

	}

	}

	mutex_unlock(&client_mutex);

	mutex_unlock(&client_mutex);

	return;

	return;





found:

found:

	snd_soc_tplg_component_remove(cmpnt, SND_SOC_TPLG_INDEX_ALL);

	snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);

	snd_soc_component_del_unlocked(cmpnt);

	snd_soc_component_del_unlocked(component);

	mutex_unlock(&client_mutex);

	mutex_unlock(&client_mutex);

	snd_soc_component_cleanup(cmpnt);

	snd_soc_component_cleanup(component);

	kfree(cmpnt);

	kfree(component);

}

}

EXPORT_SYMBOL_GPL(snd_soc_unregister_component);

EXPORT_SYMBOL_GPL(snd_soc_unregister_component);