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: Vinod Koul <vinod.koul@intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/intel/sst-mfld-dsp.h b/sound/soc/intel/sst-mfld-dsp.h
index a74477a12009f8a4d505b105328bcb5bb2a9ed99..8d482d76475a63e0b92812907ab43ffc68df3e1c 100644 (file)
--- a/sound/soc/intel/sst-mfld-dsp.h
+++ b/sound/soc/intel/sst-mfld-dsp.h
@@ -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. */

diff --git a/sound/soc/intel/sst-mfld-platform-compress.c b/sound/soc/intel/sst-mfld-platform-compress.c
index 5c3e23492fe5324eb293a080d22ec94d8d0bd4de..02abd19fce1de80a5fa2d6a055c3cd5c82316171 100644 (file)
--- a/sound/soc/intel/sst-mfld-platform-compress.c
+++ b/sound/soc/intel/sst-mfld-platform-compress.c
@@ -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)

diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index d0bc328538c9dc26dfa7cef03eacb5dbbd295173..7c790f51d2597d30d3c22325d6d4d589dc341d1d 100644 (file)
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -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;