summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2020-05-28 03:48:28 +0200
committerMark Brown <broonie@kernel.org>2020-05-30 03:11:31 +0200
commitbf5bb8db5bf07b0a82cdcdc44e4494e55aaa4ed7 (patch)
treee204e5c95e25a9a5ef86e07c8419fd38510e6ae4 /include/sound
parentASoC: soc-card: move snd_soc_card_get_codec_dai() to soc-card (diff)
downloadlinux-bf5bb8db5bf07b0a82cdcdc44e4494e55aaa4ed7.tar.xz
linux-bf5bb8db5bf07b0a82cdcdc44e4494e55aaa4ed7.zip
ASoC: soc-card: move snd_soc_card_subclass 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/874ks025jn.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.h5
-rw-r--r--include/sound/soc.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h
index 2e2dd69313d2..41bafb59eb3c 100644
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -8,6 +8,11 @@
#ifndef __SOC_CARD_H
#define __SOC_CARD_H
+enum snd_soc_card_subclass {
+ SND_SOC_CARD_CLASS_INIT = 0,
+ SND_SOC_CARD_CLASS_RUNTIME = 1,
+};
+
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,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5c126ab0e32d..060c01c32547 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -414,11 +414,6 @@ enum snd_soc_pcm_subclass {
SND_SOC_PCM_CLASS_BE = 1,
};
-enum snd_soc_card_subclass {
- SND_SOC_CARD_CLASS_INIT = 0,
- SND_SOC_CARD_CLASS_RUNTIME = 1,
-};
-
int snd_soc_register_card(struct snd_soc_card *card);
int snd_soc_unregister_card(struct snd_soc_card *card);
int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);