From: Seung-Woo Kim Date: Thu, 17 Dec 2020 03:37:18 +0000 (+0900) Subject: ASoc: meson: remove duplicated const X-Git-Tag: submit/tizen/20201221.095525~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=555119432bdcc74a20d18f3a87e129cb7ef67760;p=platform%2Fkernel%2Flinux-amlogic.git ASoc: meson: remove duplicated const The macro SOC_*_DECL() already has const, so "const SOC_*_DECL()" makes duplicated const. Remove the duplicated const. Change-Id: I259251ff91c27344f723bf7da5003ffcff99d802 Signed-off-by: Seung-Woo Kim --- diff --git a/sound/soc/codecs/amlogic/aml_codec_t9015S.c b/sound/soc/codecs/amlogic/aml_codec_t9015S.c index cd3704db908e..716423087dbf 100644 --- a/sound/soc/codecs/amlogic/aml_codec_t9015S.c +++ b/sound/soc/codecs/amlogic/aml_codec_t9015S.c @@ -150,7 +150,7 @@ static const char * const T9015S_pgain_left_txt[] = { "None", "AIL1", "AIL2", "AIL3", "AIL4" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_pgain_left_enum, +static SOC_ENUM_SINGLE_DECL(T9015S_pgain_left_enum, ADC_VOL_CTR_PGA_IN_CONFIG, PGAL_IN_SEL, T9015S_pgain_left_txt); @@ -162,7 +162,7 @@ static const char * const T9015S_pgain_right_txt[] = { "None", "AIR1", "AIR2", "AIR3", "AIR4" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_pgain_right_enum, +static SOC_ENUM_SINGLE_DECL(T9015S_pgain_right_enum, ADC_VOL_CTR_PGA_IN_CONFIG, PGAR_IN_SEL, T9015S_pgain_right_txt); @@ -174,7 +174,7 @@ static const char * const T9015S_out_lp_txt[] = { "None", "LOLP_SEL_AIL_INV", "LOLP_SEL_AIL", "Reserved", "LOLP_SEL_DACL" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_out_lp_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015S_out_lp_enum, LINE_OUT_CONFIG, LOLP_SEL_AIL_INV, T9015S_out_lp_txt); static const struct snd_kcontrol_new line_out_lp_mux = @@ -185,7 +185,7 @@ static const char * const T9015S_out_ln_txt[] = { "None", "LOLN_SEL_AIL", "LOLN_SEL_DACL", "Reserved", "LOLN_SEL_DACL_INV" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_out_ln_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015S_out_ln_enum, LINE_OUT_CONFIG, LOLN_SEL_AIL, T9015S_out_ln_txt); static const struct snd_kcontrol_new line_out_ln_mux = @@ -196,7 +196,7 @@ static const char * const T9015S_out_rp_txt[] = { "None", "LORP_SEL_AIR_INV", "LORP_SEL_AIR", "Reserved", "LORP_SEL_DACR" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_out_rp_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015S_out_rp_enum, LINE_OUT_CONFIG, LORP_SEL_AIR_INV, T9015S_out_rp_txt); static const struct snd_kcontrol_new line_out_rp_mux = @@ -207,7 +207,7 @@ static const char * const T9015S_out_rn_txt[] = { "None", "LORN_SEL_AIR", "LORN_SEL_DACR", "Reserved", "LORN_SEL_DACR_INV" }; -static const SOC_ENUM_SINGLE_DECL(T9015S_out_rn_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015S_out_rn_enum, LINE_OUT_CONFIG, LORN_SEL_AIR, T9015S_out_rn_txt); static const struct snd_kcontrol_new line_out_rn_mux = diff --git a/sound/soc/codecs/amlogic/aml_codec_tl1_acodec.c b/sound/soc/codecs/amlogic/aml_codec_tl1_acodec.c index dc5bd8bd9419..e18842a8d030 100644 --- a/sound/soc/codecs/amlogic/aml_codec_tl1_acodec.c +++ b/sound/soc/codecs/amlogic/aml_codec_tl1_acodec.c @@ -262,7 +262,7 @@ static const char * const linein_left_txt[] = { "None", "AIL1", "AIL2", "AIL3", "AIL4", }; -static const SOC_ENUM_SINGLE_DECL(linein_left_enum, +static SOC_ENUM_SINGLE_DECL(linein_left_enum, ACODEC_1, PGAL_IN_SEL, linein_left_txt); @@ -274,7 +274,7 @@ static const char * const linein_right_txt[] = { "None", "AIR1", "AIR2", "AIR3", "AIR4", }; -static const SOC_ENUM_SINGLE_DECL(linein_right_enum, +static SOC_ENUM_SINGLE_DECL(linein_right_enum, ACODEC_1, PGAR_IN_SEL, linein_right_txt); @@ -287,7 +287,7 @@ static const char * const out_lo1l_txt[] = { "None", "LO1L_SEL_INL", "LO1L_SEL_DACL", "Reserved", "LO1L_SEL_DACR_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo1l_enum, ACODEC_3, +static SOC_ENUM_SINGLE_DECL(out_lo1l_enum, ACODEC_3, LO1L_SEL_INL, out_lo1l_txt); static const struct snd_kcontrol_new lo1l_mux = @@ -298,7 +298,7 @@ static const char * const out_lo1r_txt[] = { "None", "LO1R_SEL_INR", "LO1R_SEL_DACR", "Reserved", "LO1R_SEL_DACL_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo1r_enum, ACODEC_3, +static SOC_ENUM_SINGLE_DECL(out_lo1r_enum, ACODEC_3, LO1R_SEL_INR, out_lo1r_txt); static const struct snd_kcontrol_new lo1r_mux = @@ -310,7 +310,7 @@ static const char * const out_lo2l_txt[] = { "LO2L_SEL_DAC2R_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo2l_enum, ACODEC_3, +static SOC_ENUM_SINGLE_DECL(out_lo2l_enum, ACODEC_3, LO2L_SEL_INL, out_lo2l_txt); static const struct snd_kcontrol_new lo2l_mux = @@ -322,7 +322,7 @@ static const char * const out_lo2r_txt[] = { "LO2R_SEL_DAC2L_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo2r_enum, ACODEC_3, +static SOC_ENUM_SINGLE_DECL(out_lo2r_enum, ACODEC_3, LO2R_SEL_INR, out_lo2r_txt); static const struct snd_kcontrol_new lo2r_mux = diff --git a/sound/soc/codecs/amlogic/aml_pmu3.c b/sound/soc/codecs/amlogic/aml_pmu3.c index 8b2b4b11f7d0..d40246f602ae 100644 --- a/sound/soc/codecs/amlogic/aml_pmu3.c +++ b/sound/soc/codecs/amlogic/aml_pmu3.c @@ -216,37 +216,37 @@ static const struct soc_enum pmu3_lineout_enum[] = { pmu3_lor2_in_texts), }; -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( mic_bias1_enum, PMU3_HP_MIC_DET, PMU3_MIC_BIAS1_SHIFT, mic_bias_level_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( mic_bias2_enum, PMU3_HP_MIC_DET, PMU3_MIC_BIAS2_SHIFT, mic_bias_level_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( adc_hpf_mode, PMU3_ADC_DAC, PMU3_ADC_HPF_MODE_SHIFT, adc_hpf_mode_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( aifl_src, PMU3_SIDETONE_MIXING, PMU3_ADCDATL_SRC_SHIFT, lr_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( aifr_src, PMU3_SIDETONE_MIXING, PMU3_ADCDATR_SRC_SHIFT, rl_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( dacl_src, PMU3_SIDETONE_MIXING, PMU3_DACDATL_SRC_SHIFT, lr_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( dacr_src, PMU3_SIDETONE_MIXING, PMU3_DACDATR_SRC_SHIFT, rl_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( dacl_sidetone, PMU3_SIDETONE_MIXING, PMU3_DACL_ST_SRC_SHIFT, sidetone_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( dacr_sidetone, PMU3_SIDETONE_MIXING, PMU3_DACR_ST_SRC_SHIFT, sidetone_txt); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( dac_mute_rate, PMU3_SOFT_MUTE, PMU3_DAC_RAMP_RATE_SHIFT, dac_mute_rate_txt); diff --git a/sound/soc/codecs/amlogic/aml_pmu4_codec.c b/sound/soc/codecs/amlogic/aml_pmu4_codec.c index ca1c7165446f..773518ef64d9 100644 --- a/sound/soc/codecs/amlogic/aml_pmu4_codec.c +++ b/sound/soc/codecs/amlogic/aml_pmu4_codec.c @@ -128,7 +128,7 @@ static const char * const pmu4_pgain_left_txt[] = { "None", "AIL1", "AIL2", "AIL3", "AIL4" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_pgain_left_enum, PMU4_PGA_IN_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_pgain_left_enum, PMU4_PGA_IN_CONFIG, PMU4_PGAL_IN_SEL, pmu4_pgain_left_txt); static const struct snd_kcontrol_new pgain_ln_mux = @@ -139,7 +139,7 @@ static const char * const pmu4_pgain_right_txt[] = { "None", "AIR1", "AIR2", "AIR3", "AIR4" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_pgain_right_enum, PMU4_PGA_IN_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_pgain_right_enum, PMU4_PGA_IN_CONFIG, PMU4_PGAR_IN_SEL, pmu4_pgain_right_txt); static const struct snd_kcontrol_new pgain_rn_mux = @@ -150,7 +150,7 @@ static const char * const pmu4_out_lp_txt[] = { "None", "LOLP_SEL_AIL_INV", "LOLP_SEL_AIL", "Reserved", "LOLP_SEL_DACL" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_out_lp_enum, PMU4_LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_out_lp_enum, PMU4_LINE_OUT_CONFIG, PMU4_LOLP_SEL_SHIFT, pmu4_out_lp_txt); static const struct snd_kcontrol_new line_out_lp_mux = @@ -161,7 +161,7 @@ static const char * const pmu4_out_ln_txt[] = { "None", "LOLN_SEL_AIL", "LOLN_SEL_DACL", "Reserved", "LOLN_SEL_DACL_INV" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_out_ln_enum, PMU4_LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_out_ln_enum, PMU4_LINE_OUT_CONFIG, PMU4_LOLN_SEL_SHIFT, pmu4_out_ln_txt); static const struct snd_kcontrol_new line_out_ln_mux = @@ -172,7 +172,7 @@ static const char * const pmu4_out_rp_txt[] = { "None", "LORP_SEL_AIR_INV", "LORP_SEL_AIR", "Reserved", "LORP_SEL_DACR" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_out_rp_enum, PMU4_LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_out_rp_enum, PMU4_LINE_OUT_CONFIG, PMU4_LORP_SEL_SHIFT, pmu4_out_rp_txt); static const struct snd_kcontrol_new line_out_rp_mux = @@ -183,7 +183,7 @@ static const char * const pmu4_out_rn_txt[] = { "None", "LORN_SEL_AIR", "LORN_SEL_DACR", "Reserved", "LORN_SEL_DACR_INV" }; -static const SOC_ENUM_SINGLE_DECL(pmu4_out_rn_enum, PMU4_LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(pmu4_out_rn_enum, PMU4_LINE_OUT_CONFIG, PMU4_LORN_SEL_SHIFT, pmu4_out_rn_txt); static const struct snd_kcontrol_new line_out_rn_mux =