Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e550e17f authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

ALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 



This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the codec drivers.

Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 9cb132d7

sound/soc/codecs/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream) 
		SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\

		SNDRV_PCM_RATE_48000)



struct snd_soc_codec_dai ac97_dai = {

struct snd_soc_dai ac97_dai = {

	.name = "AC97 HiFi",

	.type = SND_SOC_DAI_AC97,

	.playback = {

sound/soc/codecs/ac97.h

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
#define __LINUX_SND_SOC_AC97_H



extern struct snd_soc_codec_device soc_codec_dev_ac97;

extern struct snd_soc_codec_dai ac97_dai;

extern struct snd_soc_dai ac97_dai;



#endif

sound/soc/codecs/ak4535.c

+4 −4
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec) 
	return 0;

}



static int ak4535_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,

static int ak4535_set_dai_sysclk(struct snd_soc_dai *codec_dai,

	int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_codec *codec = codec_dai->codec;
@@ -369,7 +369,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,

static int ak4535_set_dai_fmt(struct snd_soc_dai *codec_dai,

		unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;
@@ -394,7 +394,7 @@ static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 
	return 0;

}



static int ak4535_mute(struct snd_soc_codec_dai *dai, int mute)

static int ak4535_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_codec *codec = dai->codec;

	u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
@@ -436,7 +436,7 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec, 
		SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\

		SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)



struct snd_soc_codec_dai ak4535_dai = {

struct snd_soc_dai ak4535_dai = {

	.name = "AK4535",

	.playback = {

		.stream_name = "Playback",

sound/soc/codecs/ak4535.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct ak4535_setup_data { 
	unsigned short i2c_address;

};



extern struct snd_soc_codec_dai ak4535_dai;

extern struct snd_soc_dai ak4535_dai;

extern struct snd_soc_codec_device soc_codec_dev_ak4535;



#endif

sound/soc/codecs/cs4270.c

+4 −4
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static struct { 
 * driver what the input settings can be.  This would need to be implemented

 * for stand-alone mode to work.

 */

static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,

static int cs4270_set_dai_sysclk(struct snd_soc_dai *codec_dai,

				 int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_codec *codec = codec_dai->codec;
@@ -251,7 +251,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 
 * data for playback only, but ASoC currently does not support different

 * formats for playback vs. record.

 */

static int cs4270_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,

static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,

			      unsigned int format)

{

	struct snd_soc_codec *codec = codec_dai->codec;
@@ -471,7 +471,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, 
 * board does not have the MUTEA or MUTEB pins connected to such circuitry,

 * then this function will do nothing.

 */

static int cs4270_mute(struct snd_soc_codec_dai *dai, int mute)

static int cs4270_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_codec *codec = dai->codec;

	int reg6;
@@ -667,7 +667,7 @@ static int cs4270_i2c_probe(struct i2c_adapter *adapter, int addr, int kind) 


#endif /* USE_I2C*/



struct snd_soc_codec_dai cs4270_dai = {

struct snd_soc_dai cs4270_dai = {

	.name = "CS4270",

	.playback = {

		.stream_name = "Playback",