From c2a6729550052008def3e3c6ef15cdad886b5132 Mon Sep 17 00:00:00 2001 From: "Mauro (mdrjr) Ribeiro" Date: Wed, 28 Nov 2018 16:36:12 +0900 Subject: [PATCH] ODROID: fix build on GCC 7 Change-Id: Ie4a3fbdc7ec04db53a4e0392748ef66a42fd591d --- drivers/amlogic/Makefile | 2 +- sound/soc/codecs/amlogic/aml_codec_t9015.c | 8 ++++---- sound/soc/codecs/amlogic/aml_codec_txlx_acodec.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/amlogic/Makefile b/drivers/amlogic/Makefile index f040e24857c2..846233f64589 100644 --- a/drivers/amlogic/Makefile +++ b/drivers/amlogic/Makefile @@ -9,7 +9,7 @@ ifndef CONFIG_KASAN KBUILD_CFLAGS += -Wlarger-than=28792 -KBUILD_CFLAGS += -Wstack-usage=1856 +KBUILD_CFLAGS += -Wstack-usage=1856 -Wno-bool-operation -Wno-maybe-uninitialized else ifeq ($(call cc-ifversion, -lt, 0500, y), y) $(error -----GCC VERSION TOO SMALL FOR KASAN -----) diff --git a/sound/soc/codecs/amlogic/aml_codec_t9015.c b/sound/soc/codecs/amlogic/aml_codec_t9015.c index c74b14f02941..d31d8c262213 100644 --- a/sound/soc/codecs/amlogic/aml_codec_t9015.c +++ b/sound/soc/codecs/amlogic/aml_codec_t9015.c @@ -169,7 +169,7 @@ static const char * const T9015_out_lp_txt[] = { "None", "LOLP_SEL_DACL", "LOLP_SEL_DACL_INV" }; -static const SOC_ENUM_SINGLE_DECL(T9015_out_lp_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015_out_lp_enum, LINE_OUT_CONFIG, LOLP_SEL_DACL, T9015_out_lp_txt); static const struct snd_kcontrol_new line_out_lp_mux = @@ -180,7 +180,7 @@ static const char * const T9015_out_ln_txt[] = { "None", "LOLN_SEL_DACL_INV", "LOLN_SEL_DACL" }; -static const SOC_ENUM_SINGLE_DECL(T9015_out_ln_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015_out_ln_enum, LINE_OUT_CONFIG, LOLN_SEL_DACL_INV, T9015_out_ln_txt); static const struct snd_kcontrol_new line_out_ln_mux = @@ -191,7 +191,7 @@ static const char * const T9015_out_rp_txt[] = { "None", "LORP_SEL_DACR", "LORP_SEL_DACR_INV" }; -static const SOC_ENUM_SINGLE_DECL(T9015_out_rp_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015_out_rp_enum, LINE_OUT_CONFIG, LORP_SEL_DACR, T9015_out_rp_txt); static const struct snd_kcontrol_new line_out_rp_mux = @@ -202,7 +202,7 @@ static const char * const T9015_out_rn_txt[] = { "None", "LORN_SEL_DACR_INV", "LORN_SEL_DACR" }; -static const SOC_ENUM_SINGLE_DECL(T9015_out_rn_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(T9015_out_rn_enum, LINE_OUT_CONFIG, LORN_SEL_DACR_INV, T9015_out_rn_txt); static const struct snd_kcontrol_new line_out_rn_mux = diff --git a/sound/soc/codecs/amlogic/aml_codec_txlx_acodec.c b/sound/soc/codecs/amlogic/aml_codec_txlx_acodec.c index 024323e1aa75..b463d224dde6 100644 --- a/sound/soc/codecs/amlogic/aml_codec_txlx_acodec.c +++ b/sound/soc/codecs/amlogic/aml_codec_txlx_acodec.c @@ -167,7 +167,7 @@ static const char * const linein_left_txt[] = { "None", "AIL1", "AIL2", "AIL3", }; -static const SOC_ENUM_SINGLE_DECL(linein_left_enum, +static SOC_ENUM_SINGLE_DECL(linein_left_enum, ADC_VOL_CTR_PGA_IN_CONFIG, PGAL_IN_SEL, linein_left_txt); @@ -179,7 +179,7 @@ static const char * const linein_right_txt[] = { "None", "AIR1", "AIR2", "AIR3", }; -static const SOC_ENUM_SINGLE_DECL(linein_right_enum, +static SOC_ENUM_SINGLE_DECL(linein_right_enum, ADC_VOL_CTR_PGA_IN_CONFIG, PGAR_IN_SEL, linein_right_txt); @@ -192,7 +192,7 @@ static const char * const out_l1l_txt[] = { "None", "LO1L_SEL_AIL", "LO1L_SEL_DACL", "Reserved", "LO1L_SEL_DACR_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo1l_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(out_lo1l_enum, LINE_OUT_CONFIG, LO1L_SEL_AIL, out_l1l_txt); static const struct snd_kcontrol_new lo1l_mux = @@ -203,7 +203,7 @@ static const char * const out_l1r_txt[] = { "None", "LO1R_SEL_AIR", "LO1R_SEL_DACR", "Reserved", "LO1R_SEL_DACL_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo1r_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(out_lo1r_enum, LINE_OUT_CONFIG, LO1R_SEL_AIR, out_l1r_txt); static const struct snd_kcontrol_new lo1r_mux = @@ -215,7 +215,7 @@ static const char * const out_l2ol_txt[] = { "LO2L_SEL_DAC2R_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo2l_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(out_lo2l_enum, LINE_OUT_CONFIG, LO2L_SEL_AIL, out_l2ol_txt); static const struct snd_kcontrol_new lo2l_mux = @@ -227,7 +227,7 @@ static const char * const out_lo2r_txt[] = { "LO2R_SEL_DAC2L_INV" }; -static const SOC_ENUM_SINGLE_DECL(out_lo2r_enum, LINE_OUT_CONFIG, +static SOC_ENUM_SINGLE_DECL(out_lo2r_enum, LINE_OUT_CONFIG, LO2R_SEL_AIR, out_lo2r_txt); static const struct snd_kcontrol_new lo2r_mux =