diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-05-28 10:48:11 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-05-30 02:11:29 +0100 |
| commit | 63efed582cc346c098adf6f5c852e2d5b0753783 (patch) | |
| tree | f0bee1af46409a1ded50d8631ca39ff85aa39266 /include/sound | |
| parent | ASoC: soc-card: move snd_soc_card_jack_new() to soc-card (diff) | |
| download | wireguard-linux-63efed582cc346c098adf6f5c852e2d5b0753783.tar.xz wireguard-linux-63efed582cc346c098adf6f5c852e2d5b0753783.zip | |
ASoC: soc-card: move snd_soc_card_set/get_drvdata() 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/877dww25k4.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 | 12 | ||||
| -rw-r--r-- | include/sound/soc.h | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h index 775c08d056ae..e60ad39b87bd 100644 --- a/include/sound/soc-card.h +++ b/include/sound/soc-card.h @@ -14,4 +14,16 @@ 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); +/* device driver data */ +static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card, + void *data) +{ + card->drvdata = data; +} + +static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card) +{ + return card->drvdata; +} + #endif /* __SOC_CARD_H */ diff --git a/include/sound/soc.h b/include/sound/soc.h index 38b21e815a28..3072298e756a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1260,19 +1260,6 @@ struct soc_enum { #endif }; -/* device driver data */ - -static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card, - void *data) -{ - card->drvdata = data; -} - -static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card) -{ - return card->drvdata; -} - static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc) { if (mc->reg == mc->rreg && mc->shift == mc->rshift) |