Unverified Commit 63efed58 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/877dww25k4.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+12 −0
Original line number Diff line number Diff line
@@ -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 */

include/sound/soc.h

+0 −13
Original line number Diff line number Diff line
@@ -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)