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

ASoC: soc-card: move snd_soc_card_jack_new() 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/878shc25kc.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+3 −0
Original line number Diff line number Diff line
@@ -10,5 +10,8 @@ 


struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

			  struct snd_soc_jack *jack,

			  struct snd_soc_jack_pin *pins, unsigned int num_pins);



#endif /* __SOC_CARD_H */

include/sound/soc.h

+0 −4
Original line number Diff line number Diff line
@@ -509,10 +509,6 @@ int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, 
	const struct snd_pcm_hardware *hw);



/* Jack reporting */

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

	struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins,

	unsigned int num_pins);



void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);

int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,

			  struct snd_soc_jack_pin *pins);

sound/soc/soc-card.c

+39 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

//

#include <sound/soc.h>

#include <sound/jack.h>



#define soc_card_ret(dai, ret) _soc_card_ret(dai, __func__, ret)

static inline int _soc_card_ret(struct snd_soc_card *card,
@@ -40,3 +41,41 @@ struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card, 
	return NULL;

}

EXPORT_SYMBOL_GPL(snd_soc_card_get_kcontrol);



/**

 * snd_soc_card_jack_new - Create a new jack

 * @card:  ASoC card

 * @id:    an identifying string for this jack

 * @type:  a bitmask of enum snd_jack_type values that can be detected by

 *         this jack

 * @jack:  structure to use for the jack

 * @pins:  Array of jack pins to be added to the jack or NULL

 * @num_pins: Number of elements in the @pins array

 *

 * Creates a new jack object.

 *

 * Returns zero if successful, or a negative error code on failure.

 * On success jack will be initialised.

 */

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

			  struct snd_soc_jack *jack,

			  struct snd_soc_jack_pin *pins, unsigned int num_pins)

{

	int ret;



	mutex_init(&jack->mutex);

	jack->card = card;

	INIT_LIST_HEAD(&jack->pins);

	INIT_LIST_HEAD(&jack->jack_zones);

	BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);



	ret = snd_jack_new(card->snd_card, id, type, &jack->jack, false, false);

	if (ret)

		goto end;



	if (num_pins)

		ret = snd_soc_jack_add_pins(jack, num_pins, pins);

end:

	return soc_card_ret(card, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_card_jack_new);

sound/soc/soc-jack.c

+0 −38
Original line number Diff line number Diff line
@@ -23,44 +23,6 @@ struct jack_gpio_tbl { 
	struct snd_soc_jack_gpio *gpios;

};



/**

 * snd_soc_card_jack_new - Create a new jack

 * @card:  ASoC card

 * @id:    an identifying string for this jack

 * @type:  a bitmask of enum snd_jack_type values that can be detected by

 *         this jack

 * @jack:  structure to use for the jack

 * @pins:  Array of jack pins to be added to the jack or NULL

 * @num_pins: Number of elements in the @pins array

 *

 * Creates a new jack object.

 *

 * Returns zero if successful, or a negative error code on failure.

 * On success jack will be initialised.

 */

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

	struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins,

	unsigned int num_pins)

{

	int ret;



	mutex_init(&jack->mutex);

	jack->card = card;

	INIT_LIST_HEAD(&jack->pins);

	INIT_LIST_HEAD(&jack->jack_zones);

	BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);



	ret = snd_jack_new(card->snd_card, id, type, &jack->jack, false, false);

	if (ret)

		return ret;



	if (num_pins)

		return snd_soc_jack_add_pins(jack, num_pins, pins);



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_card_jack_new);



/**

 * snd_soc_jack_report - Report the current status for a jack

 *