ASoC: codecs: remove warnings with Sparse, Coccinelle and W=1
Subsystems (7)
cover ASoC: codecs: remove warnings with Sparse, Coccinelle and W=1
This patchset contains mostly trivial fixes to make tools happy. I don't get paid more by sending lots of small patches, my only goal is to make sure tools don't spit out too many warnings and drown potential problems.
Thanks for Bard Liao for his help, and Adam Thompson and Oder Chiou for off-line reviews.
Bard liao (4):
ASoC: rt5645: remove unused mux define
ASoC: rt5670: remove unused mux/mixer define
ASoC: rt5645: store eq kcontrol byte in __be
ASoC: rl6437a: use __be32 for a __be32 buf
Pierre-Louis Bossart (17):
ASoC: dmic: declare trigger function as static
ASoC: max98090: remove unused constant variables
ASoC: es8316: remove unused constant variables
ASoC: codecs: fix kernel doc descriptions
ASoC: max98383: fix boolean assignments to true/false
ASoC: rt298: fix boolean tests
ASoC: cs4271: fix boolean assignments
ASoC: rt274: fix boolean tests
ASoc: rt286: fix boolean tests
ASoC: rt5640: fix boolean assignments
ASoC: max98927: fix boolean assignments
ASoC: rt5651: fix boolean assignments
ASoC: nau8824: fix boolean assignment
ASoC: tscs42xx.c: fix boolean test
ASoC: mt6351: remove unneeded variable
ASoC: da7219: fix endianness issues
ASoC: da7219: use logical AND
sound/soc/codecs/cs4271.c | 4 +-- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/da7219.c | 8 ++--- sound/soc/codecs/dmic.c | 4 +-- sound/soc/codecs/es8316.c | 4 --- sound/soc/codecs/max98090.c | 15 -------- sound/soc/codecs/max98373.c | 6 ++-- sound/soc/codecs/max98927.c | 8 ++--- sound/soc/codecs/mt6351.c | 4 +-- sound/soc/codecs/nau8824.c | 2 +- sound/soc/codecs/nau8825.c | 1 + sound/soc/codecs/rl6347a.c | 4 +-- sound/soc/codecs/rt274.c | 8 ++--- sound/soc/codecs/rt286.c | 8 ++--- sound/soc/codecs/rt298.c | 12 +++---- sound/soc/codecs/rt5514.c | 1 + sound/soc/codecs/rt5640.c | 6 ++-- sound/soc/codecs/rt5645.c | 66 +++++++++-------------------------- sound/soc/codecs/rt5651.c | 6 ++-- sound/soc/codecs/rt5670.c | 54 ---------------------------- sound/soc/codecs/rt5677.c | 8 ++--- sound/soc/codecs/tscs42xx.c | 2 +- 22 files changed, 63 insertions(+), 170 deletions(-)
base-commit: 14f9b94a3274b047126c8c0ff39dc495e8d1acab
Signature · 1 line
2.17.1
PATCH 1/21 ASoC: dmic: declare trigger function as static
No reason why this is global, fix warnings with W=1
--- sound/soc/codecs/dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/dmic.c +2 -2
@@ -44,8 +44,8 @@ struct dmic {int modeswitch_delay; }; -int dmic_daiops_trigger (struct snd_pcm_substream *substream, -int cmd,struct snd_soc_dai *dai) +static int dmic_daiops_trigger (struct snd_pcm_substream *substream, +int cmd,struct snd_soc_dai *dai) {struct snd_soc_component *component = dai->component;struct dmic *dmic =snd_soc_component_get_drvdata (component);
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: dmic: declare trigger function as static" to the asoc tree
The patch
ASoC: dmic: declare trigger function as static
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
902d82222270c957d12fa2e9856484d600a88d20Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:29 -0600
Subject: [PATCH] ASoC: dmic: declare trigger function as static
No reason why this is global, fix warnings with W=1
--- sound/soc/codecs/dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/dmic.c +2 -2
@@ -44,8 +44,8 @@ struct dmic {int modeswitch_delay; }; -int dmic_daiops_trigger (struct snd_pcm_substream *substream, -int cmd,struct snd_soc_dai *dai) +static int dmic_daiops_trigger (struct snd_pcm_substream *substream, +int cmd,struct snd_soc_dai *dai) {struct snd_soc_component *component = dai->component;struct dmic *dmic =snd_soc_component_get_drvdata (component);
Signature · 1 line
2.20.1
PATCH 2/21 ASoC: max98090: remove unused constant variables
In reply to Pierre-Louis BossartFix warnings with W=1
If these variables are useful then this driver should be modified to expose them.
--- sound/soc/codecs/max98090.c | 15 --------------- 1 file changed, 15 deletions(-)
sound/soc/codecs/max98090.c +0 -15
@@ -314,9 +314,6 @@ static const DECLARE_TLV_DB_SCALE(max98090_av_tlv, -1200, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_dvg_tlv, 0, 600, 0); static const DECLARE_TLV_DB_SCALE(max98090_dv_tlv, -1500, 100, 0); -static const DECLARE_TLV_DB_SCALE(max98090_sidetone_tlv, -6050, 200, 0); - -static const DECLARE_TLV_DB_SCALE(max98090_alc_tlv, -1500, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_alcmakeup_tlv, 0, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_alccomp_tlv, -3100, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_drcexp_tlv, -6600, 100, 0);
@@ -817,18 +814,6 @@ static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);static const struct snd_kcontrol_new max98090_dmic_mux =SOC_DAPM_ENUM ("DMIC Mux" , dmic_mux_enum); -static const char *max98090_micpre_text[] = {"Off" ,"On" }; - -static SOC_ENUM_SINGLE_DECL(max98090_pa1en_enum, - M98090_REG_MIC1_INPUT_LEVEL, - M98090_MIC_PA1EN_SHIFT, - max98090_micpre_text); - -static SOC_ENUM_SINGLE_DECL(max98090_pa2en_enum, - M98090_REG_MIC2_INPUT_LEVEL, - M98090_MIC_PA2EN_SHIFT, - max98090_micpre_text); -/* LINEA mixer switch */ static const struct snd_kcontrol_new max98090_linea_mixer_controls[] = { SOC_DAPM_SINGLE("IN1 Switch", M98090_REG_LINE_INPUT_CONFIG,
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: max98090: remove unused constant variables" to the asoc tree
The patch
ASoC: max98090: remove unused constant variables
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
97d8f6b71f56865e52d472247fe728700ef7128dMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:30 -0600
Subject: [PATCH] ASoC: max98090: remove unused constant variables
Fix warnings with W=1
If these variables are useful then this driver should be modified to expose them.
--- sound/soc/codecs/max98090.c | 15 --------------- 1 file changed, 15 deletions(-)
sound/soc/codecs/max98090.c +0 -15
@@ -314,9 +314,6 @@ static const DECLARE_TLV_DB_SCALE(max98090_av_tlv, -1200, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_dvg_tlv, 0, 600, 0); static const DECLARE_TLV_DB_SCALE(max98090_dv_tlv, -1500, 100, 0); -static const DECLARE_TLV_DB_SCALE(max98090_sidetone_tlv, -6050, 200, 0); - -static const DECLARE_TLV_DB_SCALE(max98090_alc_tlv, -1500, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_alcmakeup_tlv, 0, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_alccomp_tlv, -3100, 100, 0); static const DECLARE_TLV_DB_SCALE(max98090_drcexp_tlv, -6600, 100, 0);
@@ -817,18 +814,6 @@ static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);static const struct snd_kcontrol_new max98090_dmic_mux =SOC_DAPM_ENUM ("DMIC Mux" , dmic_mux_enum); -static const char *max98090_micpre_text[] = {"Off" ,"On" }; - -static SOC_ENUM_SINGLE_DECL(max98090_pa1en_enum, - M98090_REG_MIC1_INPUT_LEVEL, - M98090_MIC_PA1EN_SHIFT, - max98090_micpre_text); - -static SOC_ENUM_SINGLE_DECL(max98090_pa2en_enum, - M98090_REG_MIC2_INPUT_LEVEL, - M98090_MIC_PA2EN_SHIFT, - max98090_micpre_text); -/* LINEA mixer switch */ static const struct snd_kcontrol_new max98090_linea_mixer_controls[] = { SOC_DAPM_SINGLE("IN1 Switch", M98090_REG_LINE_INPUT_CONFIG,
Signature · 1 line
2.20.1
PATCH 3/21 ASoC: es8316: remove unused constant variables
In reply to Pierre-Louis BossartFix warnings with W=1
If these variables are useful this driver should be modified to expose them.
--- sound/soc/codecs/es8316.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/codecs/es8316.c +0 -4
@@ -159,8 +159,6 @@ static const char * const es8316_hpmux_texts[] = {"lin-rin with Boost and PGA" }; -static const unsigned int es8316_hpmux_values[] = {0 ,1 ,2 ,3 }; - static SOC_ENUM_SINGLE_DECL(es8316_left_hpmux_enum, ES8316_HPMIX_SEL, 4, es8316_hpmux_texts);
@@ -191,8 +189,6 @@ static const char * const es8316_dacsrc_texts[] = { "RDATA TO LDAC, LDATA TO RDAC", }; -static const unsigned int es8316_dacsrc_values[] = {0 ,1 ,2 ,3 }; - static SOC_ENUM_SINGLE_DECL(es8316_dacsrc_mux_enum, ES8316_DAC_SET1, 6, es8316_dacsrc_texts);
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: es8316: remove unused constant variables" to the asoc tree
The patch
ASoC: es8316: remove unused constant variables
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
37b6f0350374e6c683bc2c2d8a54d4504bc04ec1Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:31 -0600
Subject: [PATCH] ASoC: es8316: remove unused constant variables
Fix warnings with W=1
If these variables are useful this driver should be modified to expose them.
--- sound/soc/codecs/es8316.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/codecs/es8316.c +0 -4
@@ -167,8 +167,6 @@ static const char * const es8316_hpmux_texts[] = {"lin-rin with Boost and PGA" }; -static const unsigned int es8316_hpmux_values[] = {0 ,1 ,2 ,3 }; - static SOC_ENUM_SINGLE_DECL(es8316_left_hpmux_enum, ES8316_HPMIX_SEL, 4, es8316_hpmux_texts);
@@ -199,8 +197,6 @@ static const char * const es8316_dacsrc_texts[] = { "RDATA TO LDAC, LDATA TO RDAC", }; -static const unsigned int es8316_dacsrc_values[] = {0 ,1 ,2 ,3 }; - static SOC_ENUM_SINGLE_DECL(es8316_dacsrc_mux_enum, ES8316_DAC_SET1, 6, es8316_dacsrc_texts);
Signature · 1 line
2.20.1
PATCH 4/21 ASoC: codecs: fix kernel doc descriptions
In reply to Pierre-Louis BossartMissing or spurious parameter descriptions. Fix warnings with W=1
--- sound/soc/codecs/nau8825.c | 1 + sound/soc/codecs/rt5514.c | 1 + sound/soc/codecs/rt5677.c | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-)
sound/soc/codecs/nau8825.c +1 -0
@@ -351,6 +351,7 @@ static void nau8825_hpvol_ramp(struct nau8825 *nau8825,* Computes log10 of a value; the result is round off to 3 decimal. This func- * tion takes reference to dvb-math. The source code locates as the following. * Linux/drivers/media/dvb-core/dvb_math.c +* @value: input for log10 * * return log10(value) * 1000 */
sound/soc/codecs/rt5514.c +1 -0
@@ -489,6 +489,7 @@ static const struct snd_kcontrol_new rt5514_sto2_dmic_mux =/** * rt5514_calc_dmic_clk - Calculate the frequency divider parameter of dmic. * +* @component: only used for dev_warn * @rate: base clock rate. * * Choose divider parameter that gives the highest possible DMIC frequency in
sound/soc/codecs/rt5677.c +4 -4
@@ -547,7 +547,7 @@ static bool rt5677_readable_register(struct device *dev, unsigned int reg)* @rt5677: Private Data. * @addr: Address index. * @value: Address data. -* +* @opcode: opcode value * * Returns 0 for success or negative error code. */
@@ -602,7 +602,7 @@ static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,/** * rt5677_dsp_mode_i2c_read_addr - Read value from address on DSP mode. -* rt5677: Private Data. +* @rt5677: Private Data. * @addr: Address index. * @value: Address data. *
@@ -651,7 +651,7 @@ static int rt5677_dsp_mode_i2c_read_addr(/** * rt5677_dsp_mode_i2c_write - Write register on DSP mode. -* rt5677: Private Data. +* @rt5677: Private Data. * @reg: Register index. * @value: Register data. *
@@ -667,7 +667,7 @@ static int rt5677_dsp_mode_i2c_write(struct rt5677_priv *rt5677,/** * rt5677_dsp_mode_i2c_read - Read register on DSP mode. -* @codec: SoC audio codec device. +* @rt5677: Private Data * @reg: Register index. * @value: Register data. *
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: codecs: fix kernel doc descriptions" to the asoc tree
The patch
ASoC: codecs: fix kernel doc descriptions
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
dc22a4093f5d2973bef5f72b00da74ce61458bc0Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:32 -0600
Subject: [PATCH] ASoC: codecs: fix kernel doc descriptions
Missing or spurious parameter descriptions. Fix warnings with W=1
--- sound/soc/codecs/nau8825.c | 1 + sound/soc/codecs/rt5514.c | 1 + sound/soc/codecs/rt5677.c | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-)
sound/soc/codecs/nau8825.c +1 -0
@@ -351,6 +351,7 @@ static void nau8825_hpvol_ramp(struct nau8825 *nau8825,* Computes log10 of a value; the result is round off to 3 decimal. This func- * tion takes reference to dvb-math. The source code locates as the following. * Linux/drivers/media/dvb-core/dvb_math.c +* @value: input for log10 * * return log10(value) * 1000 */
sound/soc/codecs/rt5514.c +1 -0
@@ -489,6 +489,7 @@ static const struct snd_kcontrol_new rt5514_sto2_dmic_mux =/** * rt5514_calc_dmic_clk - Calculate the frequency divider parameter of dmic. * +* @component: only used for dev_warn * @rate: base clock rate. * * Choose divider parameter that gives the highest possible DMIC frequency in
sound/soc/codecs/rt5677.c +4 -4
@@ -547,7 +547,7 @@ static bool rt5677_readable_register(struct device *dev, unsigned int reg)* @rt5677: Private Data. * @addr: Address index. * @value: Address data. -* +* @opcode: opcode value * * Returns 0 for success or negative error code. */
@@ -602,7 +602,7 @@ static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,/** * rt5677_dsp_mode_i2c_read_addr - Read value from address on DSP mode. -* rt5677: Private Data. +* @rt5677: Private Data. * @addr: Address index. * @value: Address data. *
@@ -651,7 +651,7 @@ static int rt5677_dsp_mode_i2c_read_addr(/** * rt5677_dsp_mode_i2c_write - Write register on DSP mode. -* rt5677: Private Data. +* @rt5677: Private Data. * @reg: Register index. * @value: Register data. *
@@ -667,7 +667,7 @@ static int rt5677_dsp_mode_i2c_write(struct rt5677_priv *rt5677,/** * rt5677_dsp_mode_i2c_read - Read register on DSP mode. -* @codec: SoC audio codec device. +* @rt5677: Private Data * @reg: Register index. * @value: Register data. *
Signature · 1 line
2.20.1
PATCH 5/21 ASoC: rt5645: remove unused mux define
In reply to Pierre-Louis BossartFrom: Bard liao <[email protected]>
rt5645_if3_adc_in_mux, rt5645_inr_mux, and rt5645_inl_mux are not used. Remove them from the driver.
--- sound/soc/codecs/rt5645.c | 36 ------------------------------------ 1 file changed, 36 deletions(-)
sound/soc/codecs/rt5645.c +0 -36
@@ -1288,30 +1288,6 @@ static SOC_ENUM_SINGLE_DECL(static const struct snd_kcontrol_new rt5645_dac_r2_mux =SOC_DAPM_ENUM ("DAC2 R source" , rt5645_dac2r_enum); - -/* INL/R source */ -static const char *const rt5645_inl_src[] = { -"IN2P" ,"MonoP" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_inl_enum, RT5645_INL1_INR1_VOL, - RT5645_INL_SEL_SFT, rt5645_inl_src); - -static const struct snd_kcontrol_new rt5645_inl_mux = -SOC_DAPM_ENUM ("INL source" , rt5645_inl_enum); - -static const char *const rt5645_inr_src[] = { -"IN2N" ,"MonoN" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_inr_enum, RT5645_INL1_INR1_VOL, - RT5645_INR_SEL_SFT, rt5645_inr_src); - -static const struct snd_kcontrol_new rt5645_inr_mux = -SOC_DAPM_ENUM ("INR source" , rt5645_inr_enum); -/* Stereo1 ADC source */ /* MX-27 [12] */ static const char *const rt5645_stereo_adc1_src[] = {
@@ -1611,18 +1587,6 @@ static SOC_ENUM_SINGLE_DECL(static const struct snd_kcontrol_new rt5645_if2_adc_in_mux =SOC_DAPM_ENUM ("IF2 ADC IN source" , rt5645_if2_adc_in_enum); -/* MX-2F [1:0] */ -static const char *const rt5645_if3_adc_in_src[] = { -"IF_ADC1" ,"IF_ADC2" ,"VAD_ADC" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_if3_adc_in_enum, RT5645_DIG_INF1_DATA, - RT5645_IF3_ADC_IN_SFT, rt5645_if3_adc_in_src); - -static const struct snd_kcontrol_new rt5645_if3_adc_in_mux = -SOC_DAPM_ENUM ("IF3 ADC IN source" , rt5645_if3_adc_in_enum); -/* MX-31 [15] [13] [11] [9] */ static const char *const rt5645_pdm_src[] = {"Mono DAC" ,"Stereo DAC"
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt5645: remove unused mux define" to the asoc tree
The patch
ASoC: rt5645: remove unused mux define
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c3db21324442137552041711a878d75358c993aeMon Sep 17 00:00:00 2001
From: Bard liao <[email protected]>
Date: Fri, 4 Jan 2019 20:02:33 -0600
Subject: [PATCH] ASoC: rt5645: remove unused mux define
rt5645_if3_adc_in_mux, rt5645_inr_mux, and rt5645_inl_mux are not used. Remove them from the driver.
--- sound/soc/codecs/rt5645.c | 36 ------------------------------------ 1 file changed, 36 deletions(-)
sound/soc/codecs/rt5645.c +0 -36
@@ -1288,30 +1288,6 @@ static SOC_ENUM_SINGLE_DECL(static const struct snd_kcontrol_new rt5645_dac_r2_mux =SOC_DAPM_ENUM ("DAC2 R source" , rt5645_dac2r_enum); - -/* INL/R source */ -static const char *const rt5645_inl_src[] = { -"IN2P" ,"MonoP" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_inl_enum, RT5645_INL1_INR1_VOL, - RT5645_INL_SEL_SFT, rt5645_inl_src); - -static const struct snd_kcontrol_new rt5645_inl_mux = -SOC_DAPM_ENUM ("INL source" , rt5645_inl_enum); - -static const char *const rt5645_inr_src[] = { -"IN2N" ,"MonoN" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_inr_enum, RT5645_INL1_INR1_VOL, - RT5645_INR_SEL_SFT, rt5645_inr_src); - -static const struct snd_kcontrol_new rt5645_inr_mux = -SOC_DAPM_ENUM ("INR source" , rt5645_inr_enum); -/* Stereo1 ADC source */ /* MX-27 [12] */ static const char *const rt5645_stereo_adc1_src[] = {
@@ -1611,18 +1587,6 @@ static SOC_ENUM_SINGLE_DECL(static const struct snd_kcontrol_new rt5645_if2_adc_in_mux =SOC_DAPM_ENUM ("IF2 ADC IN source" , rt5645_if2_adc_in_enum); -/* MX-2F [1:0] */ -static const char *const rt5645_if3_adc_in_src[] = { -"IF_ADC1" ,"IF_ADC2" ,"VAD_ADC" -}; - -static SOC_ENUM_SINGLE_DECL ( - rt5645_if3_adc_in_enum, RT5645_DIG_INF1_DATA, - RT5645_IF3_ADC_IN_SFT, rt5645_if3_adc_in_src); - -static const struct snd_kcontrol_new rt5645_if3_adc_in_mux = -SOC_DAPM_ENUM ("IF3 ADC IN source" , rt5645_if3_adc_in_enum); -/* MX-31 [15] [13] [11] [9] */ static const char *const rt5645_pdm_src[] = {"Mono DAC" ,"Stereo DAC"
Signature · 1 line
2.20.1
PATCH 6/21 ASoC: rt5670: remove unused mux/mixer define
In reply to Pierre-Louis BossartFrom: Bard liao <[email protected]>
Some mux/mixer are not used. Remove them from the driver.
--- sound/soc/codecs/rt5670.c | 54 --------------------------------------- 1 file changed, 54 deletions(-)
sound/soc/codecs/rt5670.c +0 -54
@@ -1057,20 +1057,6 @@ static const struct snd_kcontrol_new rt5670_lout_mix[] = { RT5670_M_OV_R_LM_SFT, 1, 1), }; -static const struct snd_kcontrol_new rt5670_hpl_mix[] = { -SOC_DAPM_SINGLE ("DAC L1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_DACL1_HML_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("INL1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_INL1_HML_SFT ,1 ,1 ), -}; - -static const struct snd_kcontrol_new rt5670_hpr_mix[] = { -SOC_DAPM_SINGLE ("DAC R1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_DACR1_HMR_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("INR1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_INR1_HMR_SFT ,1 ,1 ), -}; -static const struct snd_kcontrol_new lout_l_enable_control =SOC_DAPM_SINGLE_AUTODISABLE ("Switch" ,RT5670_LOUT1 ,RT5670_L_MUTE_SFT ,1 ,1 );
@@ -1196,24 +1182,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc2_enum, RT5670_STO2_ADC_MIXER,static const struct snd_kcontrol_new rt5670_sto2_adc_2_mux =SOC_DAPM_ENUM ("Stereo2 ADC 2 Mux" , rt5670_stereo2_adc2_enum); - -/* MX-27 MX26 [10] */ -static const char *const rt5670_stereo_adc_src[] = { -"ADC1L ADC2R" ,"ADC3" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo1_adc_enum, RT5670_STO1_ADC_MIXER, - RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src); - -static const struct snd_kcontrol_new rt5670_sto_adc_mux = -SOC_DAPM_ENUM ("Stereo1 ADC source" , rt5670_stereo1_adc_enum); - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc_enum, RT5670_STO2_ADC_MIXER, - RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src); - -static const struct snd_kcontrol_new rt5670_sto2_adc_mux = -SOC_DAPM_ENUM ("Stereo2 ADC source" , rt5670_stereo2_adc_enum); -/* MX-27 MX-26 [9:8] */ static const char *const rt5670_stereo_dmic_src[] = {"DMIC1" ,"DMIC2" ,"DMIC3"
@@ -1231,17 +1199,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_dmic_enum, RT5670_STO2_ADC_MIXER,static const struct snd_kcontrol_new rt5670_sto2_dmic_mux =SOC_DAPM_ENUM ("Stereo2 DMIC source" , rt5670_stereo2_dmic_enum); -/* MX-27 [0] */ -static const char *const rt5670_stereo_dmic3_src[] = { -"DMIC3" ,"PDM ADC" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo_dmic3_enum, RT5670_STO1_ADC_MIXER, - RT5670_DMIC3_SRC_SFT, rt5670_stereo_dmic3_src); - -static const struct snd_kcontrol_new rt5670_sto_dmic3_mux = -SOC_DAPM_ENUM ("Stereo DMIC3 source" , rt5670_stereo_dmic3_enum); -/* Mono ADC source */ /* MX-28 [12] */ static const char *const rt5670_mono_adc_l1_src[] = {
@@ -1334,17 +1291,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_in_enum, RT5670_DIG_INF1_DATA,static const struct snd_kcontrol_new rt5670_if2_adc_in_mux =SOC_DAPM_ENUM ("IF2 ADC IN source" , rt5670_if2_adc_in_enum); -/* MX-30 [5:4] */ -static const char *const rt5670_if4_adc_in_src[] = { -"IF_ADC1" ,"IF_ADC2" ,"IF_ADC3" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_if4_adc_in_enum, RT5670_DIG_INF2_DATA, - RT5670_IF4_ADC_IN_SFT, rt5670_if4_adc_in_src); - -static const struct snd_kcontrol_new rt5670_if4_adc_in_mux = -SOC_DAPM_ENUM ("IF4 ADC IN source" , rt5670_if4_adc_in_enum); -/* MX-31 [15] [13] [11] [9] */ static const char *const rt5670_pdm_src[] = {"Mono DAC" ,"Stereo DAC"
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt5670: remove unused mux/mixer define" to the asoc tree
The patch
ASoC: rt5670: remove unused mux/mixer define
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6606f9df60bcb632e047e0f8a268e327cebcc3dbMon Sep 17 00:00:00 2001
From: Bard liao <[email protected]>
Date: Fri, 4 Jan 2019 20:02:34 -0600
Subject: [PATCH] ASoC: rt5670: remove unused mux/mixer define
Some mux/mixer are not used. Remove them from the driver.
--- sound/soc/codecs/rt5670.c | 54 --------------------------------------- 1 file changed, 54 deletions(-)
sound/soc/codecs/rt5670.c +0 -54
@@ -1057,20 +1057,6 @@ static const struct snd_kcontrol_new rt5670_lout_mix[] = { RT5670_M_OV_R_LM_SFT, 1, 1), }; -static const struct snd_kcontrol_new rt5670_hpl_mix[] = { -SOC_DAPM_SINGLE ("DAC L1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_DACL1_HML_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("INL1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_INL1_HML_SFT ,1 ,1 ), -}; - -static const struct snd_kcontrol_new rt5670_hpr_mix[] = { -SOC_DAPM_SINGLE ("DAC R1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_DACR1_HMR_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("INR1 Switch" ,RT5670_HPO_MIXER , -RT5670_M_INR1_HMR_SFT ,1 ,1 ), -}; -static const struct snd_kcontrol_new lout_l_enable_control =SOC_DAPM_SINGLE_AUTODISABLE ("Switch" ,RT5670_LOUT1 ,RT5670_L_MUTE_SFT ,1 ,1 );
@@ -1196,24 +1182,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc2_enum, RT5670_STO2_ADC_MIXER,static const struct snd_kcontrol_new rt5670_sto2_adc_2_mux =SOC_DAPM_ENUM ("Stereo2 ADC 2 Mux" , rt5670_stereo2_adc2_enum); - -/* MX-27 MX26 [10] */ -static const char *const rt5670_stereo_adc_src[] = { -"ADC1L ADC2R" ,"ADC3" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo1_adc_enum, RT5670_STO1_ADC_MIXER, - RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src); - -static const struct snd_kcontrol_new rt5670_sto_adc_mux = -SOC_DAPM_ENUM ("Stereo1 ADC source" , rt5670_stereo1_adc_enum); - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc_enum, RT5670_STO2_ADC_MIXER, - RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src); - -static const struct snd_kcontrol_new rt5670_sto2_adc_mux = -SOC_DAPM_ENUM ("Stereo2 ADC source" , rt5670_stereo2_adc_enum); -/* MX-27 MX-26 [9:8] */ static const char *const rt5670_stereo_dmic_src[] = {"DMIC1" ,"DMIC2" ,"DMIC3"
@@ -1231,17 +1199,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_dmic_enum, RT5670_STO2_ADC_MIXER,static const struct snd_kcontrol_new rt5670_sto2_dmic_mux =SOC_DAPM_ENUM ("Stereo2 DMIC source" , rt5670_stereo2_dmic_enum); -/* MX-27 [0] */ -static const char *const rt5670_stereo_dmic3_src[] = { -"DMIC3" ,"PDM ADC" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_stereo_dmic3_enum, RT5670_STO1_ADC_MIXER, - RT5670_DMIC3_SRC_SFT, rt5670_stereo_dmic3_src); - -static const struct snd_kcontrol_new rt5670_sto_dmic3_mux = -SOC_DAPM_ENUM ("Stereo DMIC3 source" , rt5670_stereo_dmic3_enum); -/* Mono ADC source */ /* MX-28 [12] */ static const char *const rt5670_mono_adc_l1_src[] = {
@@ -1334,17 +1291,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_in_enum, RT5670_DIG_INF1_DATA,static const struct snd_kcontrol_new rt5670_if2_adc_in_mux =SOC_DAPM_ENUM ("IF2 ADC IN source" , rt5670_if2_adc_in_enum); -/* MX-30 [5:4] */ -static const char *const rt5670_if4_adc_in_src[] = { -"IF_ADC1" ,"IF_ADC2" ,"IF_ADC3" -}; - -static SOC_ENUM_SINGLE_DECL(rt5670_if4_adc_in_enum, RT5670_DIG_INF2_DATA, - RT5670_IF4_ADC_IN_SFT, rt5670_if4_adc_in_src); - -static const struct snd_kcontrol_new rt5670_if4_adc_in_mux = -SOC_DAPM_ENUM ("IF4 ADC IN source" , rt5670_if4_adc_in_enum); -/* MX-31 [15] [13] [11] [9] */ static const char *const rt5670_pdm_src[] = {"Mono DAC" ,"Stereo DAC"
Signature · 1 line
2.20.1
PATCH 7/21 ASoC: max98383: fix boolean assignments to true/false
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/max98373.c:411:2-20: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98373.c:922:2-27: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98373.c:924:2-27: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/max98373.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/max98373.c +3 -3
@@ -408,7 +408,7 @@ static int max98373_dac_event(struct snd_soc_dapm_widget *w,regmap_update_bits (max98373->regmap,MAX98373_R20FF_GLOBAL_SHDN ,MAX98373_GLOBAL_EN_MASK ,0 ); - max98373->tdm_mode =0 ; + max98373->tdm_mode = false;break ;default :return 0 ;
@@ -919,9 +919,9 @@ static int max98373_i2c_probe(struct i2c_client *i2c,/* update interleave mode info */ if (device_property_read_bool (&i2c->dev,"maxim,interleave_mode" )) - max98373->interleave_mode =1 ; + max98373->interleave_mode = true;else - max98373->interleave_mode =0 ; + max98373->interleave_mode = false;/* regmap initialization */
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: max98383: fix boolean assignments to true/false" to the asoc tree
The patch
ASoC: max98383: fix boolean assignments to true/false
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
7c3727ba7de2b94a066e38776660e648fa4ed28aMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:35 -0600
Subject: [PATCH] ASoC: max98383: fix boolean assignments to true/false
Reported by Coccinelle:
sound/soc/codecs/max98373.c:411:2-20: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98373.c:922:2-27: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98373.c:924:2-27: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/max98373.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/max98373.c +3 -3
@@ -408,7 +408,7 @@ static int max98373_dac_event(struct snd_soc_dapm_widget *w,regmap_update_bits (max98373->regmap,MAX98373_R20FF_GLOBAL_SHDN ,MAX98373_GLOBAL_EN_MASK ,0 ); - max98373->tdm_mode =0 ; + max98373->tdm_mode = false;break ;default :return 0 ;
@@ -919,9 +919,9 @@ static int max98373_i2c_probe(struct i2c_client *i2c,/* update interleave mode info */ if (device_property_read_bool (&i2c->dev,"maxim,interleave_mode" )) - max98373->interleave_mode =1 ; + max98373->interleave_mode = true;else - max98373->interleave_mode =0 ; + max98373->interleave_mode = false;/* regmap initialization */
Signature · 1 line
2.20.1
PATCH 8/21 ASoC: rt298: fix boolean tests
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/rt298.c:992:6-8: WARNING: Comparison to bool sound/soc/codecs/rt298.c:995:6-9: WARNING: Comparison to bool sound/soc/codecs/rt298.c:317:5-7: WARNING: Comparison to bool sound/soc/codecs/rt298.c:320:5-8: WARNING: Comparison to bool sound/soc/codecs/rt298.c:348:5-7: WARNING: Comparison to bool sound/soc/codecs/rt298.c:351:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt298.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/rt298.c +6 -6
@@ -314,10 +314,10 @@ static void rt298_jack_detect_work(struct work_struct *work)if (rt298_jack_detect (rt298, &hp, &mic) <0 )return ; -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
@@ -345,10 +345,10 @@ int rt298_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jregmap_update_bits (rt298->regmap,RT298_IRQ_CTRL ,0x2 ,0x2 );rt298_jack_detect (rt298, &hp, &mic); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
@@ -989,10 +989,10 @@ static irqreturn_t rt298_irq(int irq, void *data)regmap_update_bits (rt298->regmap,RT298_IRQ_CTRL ,0x1 ,0x1 );if (ret ==0 ) { -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt298: fix boolean tests" to the asoc tree
The patch
ASoC: rt298: fix boolean tests
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f0627d006047299e427f026942fed22b111f04f5Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:36 -0600
Subject: [PATCH] ASoC: rt298: fix boolean tests
Reported by Coccinelle:
sound/soc/codecs/rt298.c:992:6-8: WARNING: Comparison to bool sound/soc/codecs/rt298.c:995:6-9: WARNING: Comparison to bool sound/soc/codecs/rt298.c:317:5-7: WARNING: Comparison to bool sound/soc/codecs/rt298.c:320:5-8: WARNING: Comparison to bool sound/soc/codecs/rt298.c:348:5-7: WARNING: Comparison to bool sound/soc/codecs/rt298.c:351:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt298.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/rt298.c +6 -6
@@ -314,10 +314,10 @@ static void rt298_jack_detect_work(struct work_struct *work)if (rt298_jack_detect (rt298, &hp, &mic) <0 )return ; -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
@@ -345,10 +345,10 @@ int rt298_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jregmap_update_bits (rt298->regmap,RT298_IRQ_CTRL ,0x2 ,0x2 );rt298_jack_detect (rt298, &hp, &mic); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
@@ -989,10 +989,10 @@ static irqreturn_t rt298_irq(int irq, void *data)regmap_update_bits (rt298->regmap,RT298_IRQ_CTRL ,0x1 ,0x1 );if (ret ==0 ) { -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt298->jack, status,
Signature · 1 line
2.20.1
PATCH 9/21 ASoC: cs4271: fix boolean assignments
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/cs4271.c:226:2-16: WARNING: Assignment of bool to 0/1 sound/soc/codecs/cs4271.c:229:2-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/cs4271.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs4271.c +2 -2
@@ -223,10 +223,10 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,switch (format &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBS_CFS : - cs4271->master =0 ; + cs4271->master = false;break ;case SND_SOC_DAIFMT_CBM_CFM : - cs4271->master =1 ; + cs4271->master = true; val |=CS4271_MODE1_MASTER ;break ;default :
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: cs4271: fix boolean assignments" to the asoc tree
The patch
ASoC: cs4271: fix boolean assignments
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
3c17bcfd35bca1bee34709e7509646b5bc88643fMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:37 -0600
Subject: [PATCH] ASoC: cs4271: fix boolean assignments
Reported by Coccinelle:
sound/soc/codecs/cs4271.c:226:2-16: WARNING: Assignment of bool to 0/1 sound/soc/codecs/cs4271.c:229:2-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/cs4271.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs4271.c +2 -2
@@ -223,10 +223,10 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,switch (format &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBS_CFS : - cs4271->master =0 ; + cs4271->master = false;break ;case SND_SOC_DAIFMT_CBM_CFM : - cs4271->master =1 ; + cs4271->master = true; val |=CS4271_MODE1_MASTER ;break ;default :
Signature · 1 line
2.20.1
PATCH 10/21 ASoC: rt274: fix boolean tests
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/rt274.c:958:6-8: WARNING: Comparison to bool sound/soc/codecs/rt274.c:961:6-9: WARNING: Comparison to bool sound/soc/codecs/rt274.c:384:5-7: WARNING: Comparison to bool sound/soc/codecs/rt274.c:387:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt274.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt274.c +4 -4
@@ -381,10 +381,10 @@ static void rt274_jack_detect_work(struct work_struct *work)if (rt274_jack_detect (rt274, &hp, &mic) <0 )return ; -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt274->jack, status,
@@ -955,10 +955,10 @@ static irqreturn_t rt274_irq(int irq, void *data) ret =rt274_jack_detect (rt274, &hp, &mic);if (ret ==0 ) { -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt274->jack, status,
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt274: fix boolean tests" to the asoc tree
The patch
ASoC: rt274: fix boolean tests
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b793a1e4ebad5c9066f404dee13fec875fb9b4e5Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:38 -0600
Subject: [PATCH] ASoC: rt274: fix boolean tests
Reported by Coccinelle:
sound/soc/codecs/rt274.c:958:6-8: WARNING: Comparison to bool sound/soc/codecs/rt274.c:961:6-9: WARNING: Comparison to bool sound/soc/codecs/rt274.c:384:5-7: WARNING: Comparison to bool sound/soc/codecs/rt274.c:387:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt274.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt274.c +4 -4
@@ -381,10 +381,10 @@ static void rt274_jack_detect_work(struct work_struct *work)if (rt274_jack_detect (rt274, &hp, &mic) <0 )return ; -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt274->jack, status,
@@ -955,10 +955,10 @@ static irqreturn_t rt274_irq(int irq, void *data) ret =rt274_jack_detect (rt274, &hp, &mic);if (ret ==0 ) { -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt274->jack, status,
Signature · 1 line
2.20.1
PATCH 11/21 ASoc: rt286: fix boolean tests
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/rt286.c:927:5-7: WARNING: Comparison to bool sound/soc/codecs/rt286.c:930:5-8: WARNING: Comparison to bool sound/soc/codecs/rt286.c:299:5-7: WARNING: Comparison to bool sound/soc/codecs/rt286.c:302:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt286.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt286.c +4 -4
@@ -296,10 +296,10 @@ static void rt286_jack_detect_work(struct work_struct *work)rt286_jack_detect (rt286, &hp, &mic); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt286->jack, status,
@@ -924,10 +924,10 @@ static irqreturn_t rt286_irq(int irq, void *data)/* Clear IRQ */ regmap_update_bits (rt286->regmap,RT286_IRQ_CTRL ,0x1 ,0x1 ); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt286->jack, status,
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoc: rt286: fix boolean tests" to the asoc tree
The patch
ASoc: rt286: fix boolean tests
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
af3b2b54cb294b997ad9a2a88ed3c6c9af7d03c0Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:39 -0600
Subject: [PATCH] ASoc: rt286: fix boolean tests
Reported by Coccinelle:
sound/soc/codecs/rt286.c:927:5-7: WARNING: Comparison to bool sound/soc/codecs/rt286.c:930:5-8: WARNING: Comparison to bool sound/soc/codecs/rt286.c:299:5-7: WARNING: Comparison to bool sound/soc/codecs/rt286.c:302:5-8: WARNING: Comparison to bool
--- sound/soc/codecs/rt286.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt286.c +4 -4
@@ -296,10 +296,10 @@ static void rt286_jack_detect_work(struct work_struct *work)rt286_jack_detect (rt286, &hp, &mic); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt286->jack, status,
@@ -924,10 +924,10 @@ static irqreturn_t rt286_irq(int irq, void *data)/* Clear IRQ */ regmap_update_bits (rt286->regmap,RT286_IRQ_CTRL ,0x1 ,0x1 ); -if (hp == true) +if (hp) status |=SND_JACK_HEADPHONE ; -if (mic == true) +if (mic) status |=SND_JACK_MICROPHONE ; snd_soc_jack_report(rt286->jack, status,
Signature · 1 line
2.20.1
PATCH 12/21 ASoC: rt5640: fix boolean assignments
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/rt5640.c:980:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5640.c:984:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5640.c:2825:1-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/rt5640.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5640.c +3 -3
@@ -977,11 +977,11 @@ static int rt5640_hp_event(struct snd_soc_dapm_widget *w,switch (event) {case SND_SOC_DAPM_POST_PMU :rt5640_pmu_depop (component); - rt5640->hp_mute =0 ; + rt5640->hp_mute = false;break ;case SND_SOC_DAPM_PRE_PMD : - rt5640->hp_mute =1 ; + rt5640->hp_mute = true;msleep (70 );break ;
@@ -2822,7 +2822,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,regmap_update_bits (rt5640->regmap,RT5640_DUMMY1 ,RT5640_MCLK_DET ,RT5640_MCLK_DET ); - rt5640->hp_mute =1 ; + rt5640->hp_mute = true; rt5640->irq = i2c->irq;INIT_DELAYED_WORK (&rt5640->bp_work, rt5640_button_press_work);INIT_WORK (&rt5640->jack_work, rt5640_jack_work);
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt5640: fix boolean assignments" to the asoc tree
The patch
ASoC: rt5640: fix boolean assignments
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
e0a99927ff5f395f24e09e6297858cd2006793f7Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:40 -0600
Subject: [PATCH] ASoC: rt5640: fix boolean assignments
Reported by Coccinelle:
sound/soc/codecs/rt5640.c:980:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5640.c:984:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5640.c:2825:1-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/rt5640.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5640.c +3 -3
@@ -977,11 +977,11 @@ static int rt5640_hp_event(struct snd_soc_dapm_widget *w,switch (event) {case SND_SOC_DAPM_POST_PMU :rt5640_pmu_depop (component); - rt5640->hp_mute =0 ; + rt5640->hp_mute = false;break ;case SND_SOC_DAPM_PRE_PMD : - rt5640->hp_mute =1 ; + rt5640->hp_mute = true;msleep (70 );break ;
@@ -2822,7 +2822,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,regmap_update_bits (rt5640->regmap,RT5640_DUMMY1 ,RT5640_MCLK_DET ,RT5640_MCLK_DET ); - rt5640->hp_mute =1 ; + rt5640->hp_mute = true; rt5640->irq = i2c->irq;INIT_DELAYED_WORK (&rt5640->bp_work, rt5640_button_press_work);INIT_WORK (&rt5640->jack_work, rt5640_jack_work);
Signature · 1 line
2.20.1
PATCH 13/21 ASoC: max98927: fix boolean assignments
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/max98927.c:508:2-20: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:889:3-28: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:891:3-28: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:893:2-27: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/max98927.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/max98927.c +4 -4
@@ -505,7 +505,7 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,switch (event) {case SND_SOC_DAPM_PRE_PMU : - max98927->tdm_mode =0 ; + max98927->tdm_mode = false;break ;case SND_SOC_DAPM_POST_PMU : regmap_update_bits(max98927->regmap,
@@ -886,11 +886,11 @@ static int max98927_i2c_probe(struct i2c_client *i2c,if (!of_property_read_u32 (i2c->dev.of_node,"interleave_mode" , &value)) {if (value >0 ) - max98927->interleave_mode =1 ; + max98927->interleave_mode = true;else - max98927->interleave_mode =0 ; + max98927->interleave_mode = false; }else - max98927->interleave_mode =0 ; + max98927->interleave_mode = false;/* regmap initialization */ max98927->regmap
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: max98927: fix boolean assignments" to the asoc tree
The patch
ASoC: max98927: fix boolean assignments
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
091cd877d8d6b2b934d565134172db771907d50aMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:41 -0600
Subject: [PATCH] ASoC: max98927: fix boolean assignments
Reported by Coccinelle:
sound/soc/codecs/max98927.c:508:2-20: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:889:3-28: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:891:3-28: WARNING: Assignment of bool to 0/1 sound/soc/codecs/max98927.c:893:2-27: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/max98927.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/max98927.c +4 -4
@@ -505,7 +505,7 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,switch (event) {case SND_SOC_DAPM_PRE_PMU : - max98927->tdm_mode =0 ; + max98927->tdm_mode = false;break ;case SND_SOC_DAPM_POST_PMU : regmap_update_bits(max98927->regmap,
@@ -886,11 +886,11 @@ static int max98927_i2c_probe(struct i2c_client *i2c,if (!of_property_read_u32 (i2c->dev.of_node,"interleave_mode" , &value)) {if (value >0 ) - max98927->interleave_mode =1 ; + max98927->interleave_mode = true;else - max98927->interleave_mode =0 ; + max98927->interleave_mode = false; }else - max98927->interleave_mode =0 ; + max98927->interleave_mode = false;/* regmap initialization */ max98927->regmap
Signature · 1 line
2.20.1
PATCH 14/21 ASoC: rt5651: fix boolean assignments
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/rt5651.c:750:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5651.c:754:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5651.c:2192:1-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/rt5651.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5651.c +3 -3
@@ -747,11 +747,11 @@ static int rt5651_hp_event(struct snd_soc_dapm_widget *w, RT5651_HP_CP_PD | RT5651_HP_SG_EN);regmap_update_bits (rt5651->regmap,RT5651_PR_BASE +RT5651_CHPUMP_INT_REG1 ,0x0700 ,0x0400 ); - rt5651->hp_mute =0 ; + rt5651->hp_mute = false;break ;case SND_SOC_DAPM_PRE_PMD : - rt5651->hp_mute =1 ; + rt5651->hp_mute = true;usleep_range (70000 ,75000 );break ;
@@ -2189,7 +2189,7 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,dev_warn (&i2c->dev,"Failed to apply regmap patch: %d\n" , ret); rt5651->irq = i2c->irq; - rt5651->hp_mute =1 ; + rt5651->hp_mute = true;INIT_DELAYED_WORK (&rt5651->bp_work, rt5651_button_press_work);INIT_WORK (&rt5651->jack_detect_work, rt5651_jack_detect_work);
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt5651: fix boolean assignments" to the asoc tree
The patch
ASoC: rt5651: fix boolean assignments
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
577dc32f9a6fc20cd404e0eb965659e9271c78beMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:42 -0600
Subject: [PATCH] ASoC: rt5651: fix boolean assignments
Reported by Coccinelle:
sound/soc/codecs/rt5651.c:750:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5651.c:754:2-17: WARNING: Assignment of bool to 0/1 sound/soc/codecs/rt5651.c:2192:1-16: WARNING: Assignment of bool to 0/1
--- sound/soc/codecs/rt5651.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5651.c +3 -3
@@ -747,11 +747,11 @@ static int rt5651_hp_event(struct snd_soc_dapm_widget *w, RT5651_HP_CP_PD | RT5651_HP_SG_EN);regmap_update_bits (rt5651->regmap,RT5651_PR_BASE +RT5651_CHPUMP_INT_REG1 ,0x0700 ,0x0400 ); - rt5651->hp_mute =0 ; + rt5651->hp_mute = false;break ;case SND_SOC_DAPM_PRE_PMD : - rt5651->hp_mute =1 ; + rt5651->hp_mute = true;usleep_range (70000 ,75000 );break ;
@@ -2189,7 +2189,7 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,dev_warn (&i2c->dev,"Failed to apply regmap patch: %d\n" , ret); rt5651->irq = i2c->irq; - rt5651->hp_mute =1 ; + rt5651->hp_mute = true;INIT_DELAYED_WORK (&rt5651->bp_work, rt5651_button_press_work);INIT_WORK (&rt5651->jack_detect_work, rt5651_jack_detect_work);
Signature · 1 line
2.20.1
PATCH 15/21 ASoC: nau8824: fix boolean assignment
In reply to Pierre-Louis BossartReported by Coccinelle:
nau8824.c:810:6-12: ERROR: Assignment of bool to non-0/1 constant
--- sound/soc/codecs/nau8824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/nau8824.c +1 -1
@@ -807,7 +807,7 @@ static const struct snd_soc_dapm_route nau8824_dapm_routes[] = {static bool nau8824_is_jack_inserted (struct nau8824 *nau8824) {struct snd_soc_jack *jack = nau8824->jack; -bool insert = FALSE; +bool insert = false;if (nau8824->irq && jack) insert = jack->status &SND_JACK_HEADPHONE ;
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: nau8824: fix boolean assignment" to the asoc tree
The patch
ASoC: nau8824: fix boolean assignment
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
290da7a7e349566f0e1541b14f25b722f58f236bMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:43 -0600
Subject: [PATCH] ASoC: nau8824: fix boolean assignment
Reported by Coccinelle:
nau8824.c:810:6-12: ERROR: Assignment of bool to non-0/1 constant
--- sound/soc/codecs/nau8824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/nau8824.c +1 -1
@@ -807,7 +807,7 @@ static const struct snd_soc_dapm_route nau8824_dapm_routes[] = {static bool nau8824_is_jack_inserted (struct nau8824 *nau8824) {struct snd_soc_jack *jack = nau8824->jack; -bool insert = FALSE; +bool insert = false;if (nau8824->irq && jack) insert = jack->status &SND_JACK_HEADPHONE ;
Signature · 1 line
2.20.1
PATCH 16/21 ASoC: tscs42xx.c: fix boolean test
In reply to Pierre-Louis BossartReported by Coccinelle:
sound/soc/codecs/tscs42xx.c:392:5-31: WARNING: Comparison to bool
--- sound/soc/codecs/tscs42xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tscs42xx.c +1 -1
@@ -389,7 +389,7 @@ static int dac_event(struct snd_soc_dapm_widget *w,mutex_lock (&tscs42xx->coeff_ram_lock); -if (tscs42xx->coeff_ram_synced == false) { +if (!tscs42xx->coeff_ram_synced) { ret =write_coeff_ram (component, tscs42xx->coeff_ram,0x00 ,COEFF_RAM_COEFF_COUNT );if (ret <0 )
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: tscs42xx.c: fix boolean test" to the asoc tree
The patch
ASoC: tscs42xx.c: fix boolean test
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f361ca36802031ae3abf9860a02e1d5931c04b63Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:44 -0600
Subject: [PATCH] ASoC: tscs42xx.c: fix boolean test
Reported by Coccinelle:
sound/soc/codecs/tscs42xx.c:392:5-31: WARNING: Comparison to bool
--- sound/soc/codecs/tscs42xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tscs42xx.c +1 -1
@@ -389,7 +389,7 @@ static int dac_event(struct snd_soc_dapm_widget *w,mutex_lock (&tscs42xx->coeff_ram_lock); -if (tscs42xx->coeff_ram_synced == false) { +if (!tscs42xx->coeff_ram_synced) { ret =write_coeff_ram (component, tscs42xx->coeff_ram,0x00 ,COEFF_RAM_COEFF_COUNT );if (ret <0 )
Signature · 1 line
2.20.1
PATCH 17/21 ASoC: mt6351: remove unneeded variable
In reply to Pierre-Louis BossartReported by Coccinelle:
mt6351.c:1418:5-8: Unneeded variable: "ret". Return "0" on line 1437
--- sound/soc/codecs/mt6351.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/codecs/mt6351.c +1 -3
@@ -1415,8 +1415,6 @@ static const struct snd_soc_dapm_route mt6351_dapm_routes[] = {static int mt6351_codec_init_reg (struct snd_soc_component *cmpnt) { -int ret =0 ; -/* Disable CLKSQ 26MHz */ regmap_update_bits (cmpnt->regmap,MT6351_TOP_CLKSQ ,0x0001 ,0x0 );/* disable AUDGLB */
@@ -1434,7 +1432,7 @@ static int mt6351_codec_init_reg(struct snd_soc_component *cmpnt)/* Reverse the PMIC clock*/ regmap_update_bits (cmpnt->regmap,MT6351_AFE_PMIC_NEWIF_CFG2 ,0x8000 ,0x8000 ); -return ret; +return 0 ; }static int mt6351_codec_probe (struct snd_soc_component *cmpnt)
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: mt6351: remove unneeded variable" to the asoc tree
The patch
ASoC: mt6351: remove unneeded variable
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
d61780c155e8bef8dceb3ac98d29f79c24e264ebMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:45 -0600
Subject: [PATCH] ASoC: mt6351: remove unneeded variable
Reported by Coccinelle:
mt6351.c:1418:5-8: Unneeded variable: "ret". Return "0" on line 1437
--- sound/soc/codecs/mt6351.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/codecs/mt6351.c +1 -3
@@ -1415,8 +1415,6 @@ static const struct snd_soc_dapm_route mt6351_dapm_routes[] = {static int mt6351_codec_init_reg (struct snd_soc_component *cmpnt) { -int ret =0 ; -/* Disable CLKSQ 26MHz */ regmap_update_bits (cmpnt->regmap,MT6351_TOP_CLKSQ ,0x0001 ,0x0 );/* disable AUDGLB */
@@ -1434,7 +1432,7 @@ static int mt6351_codec_init_reg(struct snd_soc_component *cmpnt)/* Reverse the PMIC clock*/ regmap_update_bits (cmpnt->regmap,MT6351_AFE_PMIC_NEWIF_CFG2 ,0x8000 ,0x8000 ); -return ret; +return 0 ; }static int mt6351_codec_probe (struct snd_soc_component *cmpnt)
Signature · 1 line
2.20.1
PATCH 18/21 ASoC: da7219: fix endianness issues
In reply to Pierre-Louis BossartReported by Sparse.
da7219.c:440:44: warning: cast to restricted __le16 da7219.c:461:13: warning: incorrect type in assignment (different base types)
da7219.c:461:13: expected unsigned short [unsigned] [usertype] val
da7219.c:461:13: got restricted __le16 [usertype] <noident>
da7219.c:1451:16: warning: incorrect type in assignment (different base types)
da7219.c:1451:16: expected unsigned short [unsigned] [usertype] offset
da7219.c:1451:16: got restricted __le16 [usertype] <noident>
da7219-aad.c:150:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:150:37: expected unsigned short [unsigned] [usertype] tonegen_freq_hptest
da7219-aad.c:150:37: got restricted __le16 [usertype] <noident>
da7219-aad.c:157:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:157:37: expected unsigned short [unsigned] [usertype] tonegen_freq_hptest
da7219-aad.c:157:37: got restricted __le16 [usertype] <noident>
--- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/da7219.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/da7219-aad.c +1 -1
@@ -117,7 +117,7 @@ static void da7219_aad_hptest_work(struct work_struct *work)struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (component);struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component); -u16 tonegen_freq_hptest; +__le16 tonegen_freq_hptest;u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;int report =0 , ret =0 ;
sound/soc/codecs/da7219.c +3 -3
@@ -423,7 +423,7 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol,struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;mutex_lock (&da7219->ctrl_lock);
@@ -450,7 +450,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol,struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;/*
@@ -1396,7 +1396,7 @@ static int da7219_set_dai_tdm_slot(struct snd_soc_dai *dai,struct snd_soc_component *component = dai->component;struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component);u8 dai_bclks_per_wclk; -u16 offset; +__le16 offset;u32 frame_size;/* No channels enabled so disable TDM, revert to 64-bit frames */
Signature · 1 line
2.17.1
RE: [PATCH 18/21] ASoC: da7219: fix endianness issues
Quoted 19 lines · Pierre-Louis Bossart
Reported by Sparse.
da7219.c:440:44: warning: cast to restricted
__le16da7219.c:461:13: warning: incorrect type in assignment (different base types)
da7219.c:461:13: expected unsigned short [unsigned] [usertype] val
da7219.c:461:13: got restricted__le16[usertype] <noident>
da7219.c:1451:16: warning: incorrect type in assignment (different base types)
da7219.c:1451:16: expected unsigned short [unsigned] [usertype] offset
da7219.c:1451:16: got restricted__le16[usertype] <noident>da7219-aad.c:150:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:150:37: expected unsigned short [unsigned] [usertype]tonegen_freq_hptest
da7219-aad.c:150:37: got restricted__le16[usertype] <noident>
da7219-aad.c:157:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:157:37: expected unsigned short [unsigned] [usertype]tonegen_freq_hptest
da7219-aad.c:157:37: got restricted__le16[usertype] <noident>
Quoted 2 lines
Cc Adam Thomson <[email protected]>Signed-off-by Pierre-Louis Bossart <[email protected]>
Quoted 58 lines
--- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/da7219.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)sound/soc/codecs/da7219-aad.c +1
-1@@ -117,7 +117,7 @@ static void da7219_aad_hptest_work(struct work_struct *work)struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (component);struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component); -u16 tonegen_freq_hptest; +__le16 tonegen_freq_hptest;sound/soc/codecs/da7219-aad.c +0
-0u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;int report =0 , ret =0 ;sound/soc/codecs/da7219.c index renamed from sound/soc/codecs/da7219.c +0
-0
e46e9f4bc994..ce165047b9f9100644sound/soc/codecs/da7219.c +1
-1@@ -423,7 +423,7 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;sound/soc/codecs/da7219.c +1
-1mutex_lock (&da7219->ctrl_lock);@@ -450,7 +450,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;sound/soc/codecs/da7219.c +1
-1/* @@ -1396,7 +1396,7 @@ static int da7219_set_dai_tdm_slot(struct snd_soc_dai *dai, struct snd_soc_component *component = dai->component;struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component);u8 dai_bclks_per_wclk; -u16 offset; +__le16 offset;u32 frame_size;/* No channels enabled so disable TDM, revert to 64-bit frames */
--
2.17.1
Mark Brown
maintainerApplied "ASoC: da7219: fix endianness issues" to the asoc tree
In reply to Pierre-Louis BossartThe patch
ASoC: da7219: fix endianness issues
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
123c3def3bc5ea9958b8191d8139f610ed972d18Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:46 -0600
Subject: [PATCH] ASoC: da7219: fix endianness issues
Reported by Sparse.
da7219.c:440:44: warning: cast to restricted __le16 da7219.c:461:13: warning: incorrect type in assignment (different base types)
da7219.c:461:13: expected unsigned short [unsigned] [usertype] val
da7219.c:461:13: got restricted __le16 [usertype] <noident>
da7219.c:1451:16: warning: incorrect type in assignment (different base types)
da7219.c:1451:16: expected unsigned short [unsigned] [usertype] offset
da7219.c:1451:16: got restricted __le16 [usertype] <noident>
da7219-aad.c:150:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:150:37: expected unsigned short [unsigned] [usertype] tonegen_freq_hptest
da7219-aad.c:150:37: got restricted __le16 [usertype] <noident>
da7219-aad.c:157:37: warning: incorrect type in assignment (different base types)
da7219-aad.c:157:37: expected unsigned short [unsigned] [usertype] tonegen_freq_hptest
da7219-aad.c:157:37: got restricted __le16 [usertype] <noident>
--- sound/soc/codecs/da7219-aad.c | 2 +- sound/soc/codecs/da7219.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/da7219-aad.c +1 -1
@@ -117,7 +117,7 @@ static void da7219_aad_hptest_work(struct work_struct *work)struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (component);struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component); -u16 tonegen_freq_hptest; +__le16 tonegen_freq_hptest;u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;int report =0 , ret =0 ;
sound/soc/codecs/da7219.c +3 -3
@@ -423,7 +423,7 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol,struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;mutex_lock (&da7219->ctrl_lock);
@@ -450,7 +450,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol,struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value;unsigned int reg = mixer_ctrl->reg; -u16 val; +__le16 val;int ret;/*
@@ -1396,7 +1396,7 @@ static int da7219_set_dai_tdm_slot(struct snd_soc_dai *dai,struct snd_soc_component *component = dai->component;struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component);u8 dai_bclks_per_wclk; -u16 offset; +__le16 offset;u32 frame_size;/* No channels enabled so disable TDM, revert to 64-bit frames */
Signature · 1 line
2.20.1
PATCH 19/21 ASoC: da7219: use logical AND
In reply to Pierre-Louis BossartReported by Sparse:
da7219.c:841:57: warning: dubious: x & !y
--- sound/soc/codecs/da7219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/da7219.c +1 -1
@@ -838,7 +838,7 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, ++i;msleep (50 ); } - }while ((i <DA7219_SRM_CHECK_RETRIES ) & (!srm_lock)); + }while ((i <DA7219_SRM_CHECK_RETRIES ) && (!srm_lock));if (!srm_lock)dev_warn (component->dev,"SRM failed to lock\n" );
Signature · 1 line
2.17.1
RE: [PATCH 19/21] ASoC: da7219: use logical AND
Quoted 5 lines · Pierre-Louis Bossart
Reported by Sparse:
da7219.c:841:57: warning: dubious: x & !yCc Adam Thomson <[email protected]>Signed-off-by Pierre-Louis Bossart <[email protected]>
Quoted 20 lines
--- sound/soc/codecs/da7219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/codecs/da7219.c index renamed from sound/soc/codecs/da7219.c +0
-0
ce165047b9f9..513ec0368653100644sound/soc/codecs/da7219.c +1
-1@@ -838,7 +838,7 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, ++i;msleep (50 ); } - }while ((i <DA7219_SRM_CHECK_RETRIES ) & (!srm_lock)); + }while ((i <DA7219_SRM_CHECK_RETRIES ) && (!srm_lock));if (!srm_lock)
dev_warn(component->dev, "SRM failed to lock\n");
--
2.17.1
Mark Brown
maintainerApplied "ASoC: da7219: use logical AND" to the asoc tree
In reply to Pierre-Louis BossartThe patch
ASoC: da7219: use logical AND
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b468f379e1e01b723825267431d3ba60f824fda2Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 4 Jan 2019 20:02:47 -0600
Subject: [PATCH] ASoC: da7219: use logical AND
Reported by Sparse:
da7219.c:841:57: warning: dubious: x & !y
--- sound/soc/codecs/da7219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/da7219.c +1 -1
@@ -838,7 +838,7 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, ++i;msleep (50 ); } - }while ((i <DA7219_SRM_CHECK_RETRIES ) & (!srm_lock)); + }while ((i <DA7219_SRM_CHECK_RETRIES ) && (!srm_lock));if (!srm_lock)dev_warn (component->dev,"SRM failed to lock\n" );
Signature · 1 line
2.20.1
PATCH 20/21 ASoC: rt5645: store eq kcontrol byte in __be
In reply to Pierre-Louis BossartFrom: Bard liao <[email protected]>
The eq parameters binary is stored in __be. However, it is unsigned short in rt5645_eq_param_s{} which will cause incorrect type assignment. So add struct rt5645_eq_param_s_be16{} to store the eq binary and convert it to unsigned short in rt5645->eq_param.
--- sound/soc/codecs/rt5645.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
sound/soc/codecs/rt5645.c +16 -14
@@ -401,6 +401,11 @@ struct rt5645_eq_param_s {unsigned short val; }; +struct rt5645_eq_param_s_be16 { +__be16 reg; +__be16 val; +}; +static const char *const rt5645_supply_names[] = {"avdd" ,"cpvdd" ,
@@ -672,8 +677,8 @@ static int rt5645_hweq_get(struct snd_kcontrol *kcontrol, {struct snd_soc_component *component =snd_kcontrol_chip (kcontrol);struct rt5645_priv *rt5645 =snd_soc_component_get_drvdata (component); -struct rt5645_eq_param_s *eq_param = - (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; +struct rt5645_eq_param_s_be16 *eq_param = + (struct rt5645_eq_param_s_be16 *)ucontrol->value.bytes.data;int i;for (i =0 ; i <RT5645_HWEQ_NUM ; i++) {
@@ -698,36 +703,33 @@ static int rt5645_hweq_put(struct snd_kcontrol *kcontrol, {struct snd_soc_component *component =snd_kcontrol_chip (kcontrol);struct rt5645_priv *rt5645 =snd_soc_component_get_drvdata (component); -struct rt5645_eq_param_s *eq_param = - (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; +struct rt5645_eq_param_s_be16 *eq_param = + (struct rt5645_eq_param_s_be16 *)ucontrol->value.bytes.data;int i;for (i =0 ; i <RT5645_HWEQ_NUM ; i++) { - eq_param[i].reg =be16_to_cpu (eq_param[i].reg); - eq_param[i].val =be16_to_cpu (eq_param[i].val); + rt5645->eq_param[i].reg =be16_to_cpu (eq_param[i].reg); + rt5645->eq_param[i].val =be16_to_cpu (eq_param[i].val); }/* The final setting of the table should be RT5645_EQ_CTRL2 */ for (i =RT5645_HWEQ_NUM -1 ; i >=0 ; i--) { -if (eq_param[i].reg ==0 ) +if (rt5645->eq_param[i].reg ==0 )continue ; -else if (eq_param[i].reg !=RT5645_EQ_CTRL2 ) +else if (rt5645->eq_param[i].reg !=RT5645_EQ_CTRL2 )return 0 ;else break ; }for (i =0 ; i <RT5645_HWEQ_NUM ; i++) { -if (!rt5645_validate_hweq (eq_param[i].reg) && - eq_param[i].reg !=0 ) +if (!rt5645_validate_hweq (rt5645->eq_param[i].reg) && + rt5645->eq_param[i].reg !=0 )return 0 ; -else if (eq_param[i].reg ==0 ) +else if (rt5645->eq_param[i].reg ==0 )break ; } -memcpy (rt5645->eq_param, eq_param, -RT5645_HWEQ_NUM *sizeof (struct rt5645_eq_param_s )); -return 0 ; }
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rt5645: store eq kcontrol byte in __be" to the asoc tree
The patch
ASoC: rt5645: store eq kcontrol byte in __be
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
60b52ed627213d1782e70b9810f5668f61bba3a8Mon Sep 17 00:00:00 2001
From: Bard liao <[email protected]>
Date: Fri, 4 Jan 2019 20:02:48 -0600
Subject: [PATCH] ASoC: rt5645: store eq kcontrol byte in __be
The eq parameters binary is stored in __be. However, it is unsigned short in rt5645_eq_param_s{} which will cause incorrect type assignment. So add struct rt5645_eq_param_s_be16{} to store the eq binary and convert it to unsigned short in rt5645->eq_param.
--- sound/soc/codecs/rt5645.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
sound/soc/codecs/rt5645.c +16 -14
@@ -401,6 +401,11 @@ struct rt5645_eq_param_s {unsigned short val; }; +struct rt5645_eq_param_s_be16 { +__be16 reg; +__be16 val; +}; +static const char *const rt5645_supply_names[] = {"avdd" ,"cpvdd" ,
@@ -672,8 +677,8 @@ static int rt5645_hweq_get(struct snd_kcontrol *kcontrol, {struct snd_soc_component *component =snd_kcontrol_chip (kcontrol);struct rt5645_priv *rt5645 =snd_soc_component_get_drvdata (component); -struct rt5645_eq_param_s *eq_param = - (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; +struct rt5645_eq_param_s_be16 *eq_param = + (struct rt5645_eq_param_s_be16 *)ucontrol->value.bytes.data;int i;for (i =0 ; i <RT5645_HWEQ_NUM ; i++) {
@@ -698,36 +703,33 @@ static int rt5645_hweq_put(struct snd_kcontrol *kcontrol, {struct snd_soc_component *component =snd_kcontrol_chip (kcontrol);struct rt5645_priv *rt5645 =snd_soc_component_get_drvdata (component); -struct rt5645_eq_param_s *eq_param = - (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; +struct rt5645_eq_param_s_be16 *eq_param = + (struct rt5645_eq_param_s_be16 *)ucontrol->value.bytes.data;int i;for (i =0 ; i <RT5645_HWEQ_NUM ; i++) { - eq_param[i].reg =be16_to_cpu (eq_param[i].reg); - eq_param[i].val =be16_to_cpu (eq_param[i].val); + rt5645->eq_param[i].reg =be16_to_cpu (eq_param[i].reg); + rt5645->eq_param[i].val =be16_to_cpu (eq_param[i].val); }/* The final setting of the table should be RT5645_EQ_CTRL2 */ for (i =RT5645_HWEQ_NUM -1 ; i >=0 ; i--) { -if (eq_param[i].reg ==0 ) +if (rt5645->eq_param[i].reg ==0 )continue ; -else if (eq_param[i].reg !=RT5645_EQ_CTRL2 ) +else if (rt5645->eq_param[i].reg !=RT5645_EQ_CTRL2 )return 0 ;else break ; }for (i =0 ; i <RT5645_HWEQ_NUM ; i++) { -if (!rt5645_validate_hweq (eq_param[i].reg) && - eq_param[i].reg !=0 ) +if (!rt5645_validate_hweq (rt5645->eq_param[i].reg) && + rt5645->eq_param[i].reg !=0 )return 0 ; -else if (eq_param[i].reg ==0 ) +else if (rt5645->eq_param[i].reg ==0 )break ; } -memcpy (rt5645->eq_param, eq_param, -RT5645_HWEQ_NUM *sizeof (struct rt5645_eq_param_s )); -return 0 ; }
Signature · 1 line
2.20.1
PATCH 21/21 ASoC: rl6437a: use __be32 for a __be32 buf
In reply to Pierre-Louis BossartFrom: Bard liao <[email protected]>
The buf in rl6347a_hw_read is __be32.
--- sound/soc/codecs/rl6347a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rl6347a.c +2 -2
@@ -64,8 +64,8 @@ int rl6347a_hw_read(void *context, unsigned int reg, unsigned int *value)struct i2c_client *client = context;struct i2c_msg xfer[2 ];int ret; -__be32 be_reg; -unsigned int index, vid, buf =0x0 ; +__be32 be_reg, buf =0x0 ; +unsigned int index, vid;/* handle index registers */ if (reg <=0xff ) {
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: rl6437a: use __be32 for a __be32 buf" to the asoc tree
The patch
ASoC: rl6437a: use __be32 for a __be32 buf
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b8e022e83ba99a0deb27e929033008402f863dd7Mon Sep 17 00:00:00 2001
From: Bard liao <[email protected]>
Date: Fri, 4 Jan 2019 20:02:49 -0600
Subject: [PATCH] ASoC: rl6437a: use __be32 for a __be32 buf
The buf in rl6347a_hw_read is __be32.
--- sound/soc/codecs/rl6347a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rl6347a.c +2 -2
@@ -64,8 +64,8 @@ int rl6347a_hw_read(void *context, unsigned int reg, unsigned int *value)struct i2c_client *client = context;struct i2c_msg xfer[2 ];int ret; -__be32 be_reg; -unsigned int index, vid, buf =0x0 ; +__be32 be_reg, buf =0x0 ; +unsigned int index, vid;/* handle index registers */ if (reg <=0xff ) {
Signature · 1 line
2.20.1