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

Commit d7b54c30 authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: Intel: remove codec memeber from codec structs 



As we already have a memeber struct snd_sst_params.codec to fill this.
so removing duplicate instance

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent bd17aa45

sound/soc/intel/sst-mfld-dsp.h

+0 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ enum stream_type { 
};



struct snd_pcm_params {

	u16 codec;	/* codec type */

	u8 num_chan;	/* 1=Mono, 2=Stereo */

	u8 pcm_wd_sz;	/* 16/24 - bit*/

	u32 reserved;	/* Bitrate in bits per second */
@@ -49,7 +48,6 @@ struct snd_pcm_params { 


/* MP3 Music Parameters Message */

struct snd_mp3_params {

	u16 codec;

	u8  num_chan;	/* 1=Mono, 2=Stereo	*/

	u8  pcm_wd_sz; /* 16/24 - bit*/

	u8  crc_check; /* crc_check - disable (0) or enable (1) */
@@ -63,7 +61,6 @@ struct snd_mp3_params { 


/* AAC Music Parameters Message */

struct snd_aac_params {

	u16 codec;

	u8 num_chan; /* 1=Mono, 2=Stereo*/

	u8 pcm_wd_sz; /* 16/24 - bit*/

	u8 bdownsample; /*SBR downsampling 0 - disable 1 -enabled AAC+ only */
@@ -77,7 +74,6 @@ struct snd_aac_params { 


/* WMA Music Parameters Message */

struct snd_wma_params {

	u16 codec;

	u8  num_chan;	/* 1=Mono, 2=Stereo */

	u8  pcm_wd_sz;	/* 16/24 - bit*/

	u32 brate;	/* Use the hard coded value. */

sound/soc/intel/sst-mfld-platform-compress.c

+0 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static int sst_platform_compr_set_params(struct snd_compr_stream *cstream, 
	switch (params->codec.id) {

	case SND_AUDIOCODEC_MP3: {

		str_params.codec = SST_CODEC_TYPE_MP3;

		str_params.sparams.uc.mp3_params.codec = SST_CODEC_TYPE_MP3;

		str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in;

		str_params.sparams.uc.mp3_params.pcm_wd_sz = 16;

		break;
@@ -120,7 +119,6 @@ static int sst_platform_compr_set_params(struct snd_compr_stream *cstream, 


	case SND_AUDIOCODEC_AAC: {

		str_params.codec = SST_CODEC_TYPE_AAC;

		str_params.sparams.uc.aac_params.codec = SST_CODEC_TYPE_AAC;

		str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in;

		str_params.sparams.uc.aac_params.pcm_wd_sz = 16;

		if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS)

sound/soc/intel/sst-mfld-platform-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static void sst_fill_pcm_params(struct snd_pcm_substream *substream, 
				struct sst_pcm_params *param)

{



	param->codec = SST_CODEC_TYPE_PCM;

	param->num_chan = (u8) substream->runtime->channels;

	param->pcm_wd_sz = substream->runtime->sample_bits;

	param->reserved = 0;