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

ASoC: soc-card: move snd_soc_card_get_kcontrol() to soc-card 



Card related function should be implemented at soc-card now.
This patch moves it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87a71s25kj.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1793936b

include/sound/soc-card.h

+3 −0
Original line number Diff line number Diff line
@@ -8,4 +8,7 @@ 
#ifndef __SOC_CARD_H

#define __SOC_CARD_H



struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);



#endif /* __SOC_CARD_H */

include/sound/soc.h

+0 −2
Original line number Diff line number Diff line
@@ -582,8 +582,6 @@ static inline int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops) 
struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,

				  void *data, const char *long_name,

				  const char *prefix);

struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

int snd_soc_add_component_controls(struct snd_soc_component *component,

	const struct snd_kcontrol_new *controls, unsigned int num_controls);

int snd_soc_add_card_controls(struct snd_soc_card *soc_card,

sound/soc/soc-card.c

+16 −0
Original line number Diff line number Diff line
@@ -24,3 +24,19 @@ static inline int _soc_card_ret(struct snd_soc_card *card, 


	return ret;

}



struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name)

{

	struct snd_card *card = soc_card->snd_card;

	struct snd_kcontrol *kctl;



	if (unlikely(!name))

		return NULL;



	list_for_each_entry(kctl, &card->controls, list)

		if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name)))

			return kctl;

	return NULL;

}

EXPORT_SYMBOL_GPL(snd_soc_card_get_kcontrol);

sound/soc/soc-core.c

+0 −16
Original line number Diff line number Diff line
@@ -2096,22 +2096,6 @@ static int snd_soc_add_controls(struct snd_card *card, struct device *dev, 
	return 0;

}



struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name)

{

	struct snd_card *card = soc_card->snd_card;

	struct snd_kcontrol *kctl;



	if (unlikely(!name))

		return NULL;



	list_for_each_entry(kctl, &card->controls, list)

		if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name)))

			return kctl;

	return NULL;

}

EXPORT_SYMBOL_GPL(snd_soc_card_get_kcontrol);



/**

 * snd_soc_add_component_controls - Add an array of controls to a component.

 *