diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-05-28 10:48:03 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-30 02:11:28 +0100 |
| commit | 3359e9b6fa3eafeeb79d5f0ec8a04f3fe6986db1 (patch) | |
| tree | 4b6a18562336280dac611ec3b056085fe5211058 /include/sound | |
| parent | 209c6cdfd28360f030f88ae9adb69f633e6bcd2d (diff) | |
| download | linux-3359e9b6fa3eafeeb79d5f0ec8a04f3fe6986db1.tar.gz linux-3359e9b6fa3eafeeb79d5f0ec8a04f3fe6986db1.tar.bz2 linux-3359e9b6fa3eafeeb79d5f0ec8a04f3fe6986db1.zip | |
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/878shc25kc.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-card.h | 3 | ||||
| -rw-r--r-- | include/sound/soc.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h index c601eddf0975..775c08d056ae 100644 --- a/include/sound/soc-card.h +++ b/include/sound/soc-card.h @@ -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 */ diff --git a/include/sound/soc.h b/include/sound/soc.h index f93827c6be51..38b21e815a28 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -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); |