ASoC: rt1011: fix warning reported by kbuild test robot and minor issue
Subsystems (3)
PATCH 1/1 ASoC: rt1011: fix warning reported by kbuild test robot and minor issue
From: Shuming Fan <[email protected]>
This patch fixes following issues:
- warning: this decimal constant is unsigned only in ISO C90
- sparse: incorrect type in assignment
- check if value.integer.value is zero for "R0 Load Mode" control
--- sound/soc/codecs/rt1011.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/soc/codecs/rt1011.c +9 -6
@@ -1145,8 +1145,8 @@ static int rt1011_bq_drc_coeff_get(struct snd_kcontrol *kcontrol, bq_drc_info = rt1011->bq_drc_params[mode_idx];for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) { - params[i].reg =cpu_to_le16 (bq_drc_info[i].reg); - params[i].val =cpu_to_le16 (bq_drc_info[i].val); + params[i].reg = bq_drc_info[i].reg; + params[i].val = bq_drc_info[i].val; }return 0 ;
@@ -1187,8 +1187,8 @@ static int rt1011_bq_drc_coeff_put(struct snd_kcontrol *kcontrol,pr_info ("%s, id.name=%s, mode_idx=%d\n" , __func__, ucontrol->id.name, mode_idx);for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) { - bq_drc_info[i].reg =le16_to_cpu (params[i].reg); - bq_drc_info[i].val =le16_to_cpu (params[i].val); + bq_drc_info[i].reg = params[i].reg; + bq_drc_info[i].val = params[i].val; }for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) {
@@ -1284,11 +1284,14 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol,if (!component->card->instantiated)return 0 ; +if (ucontrol->value.integer.value[0 ] ==0 ) +return -EINVAL ; + dev =regmap_get_device (rt1011->regmap);if (snd_soc_component_get_bias_level (component) ==SND_SOC_BIAS_OFF ) { rt1011->r0_reg = ucontrol->value.integer.value[0 ]; - format =2147483648 ;/* 2^24 * 128 */ + format =2147483648U ;/* 2^24 * 128 */ r0_integer = format / rt1011->r0_reg /128 ; r0_factor = ((format / rt1011->r0_reg *100 ) /128 ) - (r0_integer *100 );
@@ -2120,7 +2123,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag)dev_err (dev,"Calibrate R0 Failure\n" ); ret = -EAGAIN ; }else { - format =2147483648 ;/* 2^24 * 128 */ + format =2147483648U ;/* 2^24 * 128 */ r0_integer = format / r0[0 ] /128 ; r0_factor = ((format / r0[0 ] *100 ) /128 ) - (r0_integer *100 );
Signature · 1 line
2.21.0
Mark Brown
maintainerApplied "ASoC: rt1011: fix warning reported by kbuild test robot and minor issue" to the asoc tree
The patch
ASoC: rt1011: fix warning reported by kbuild test robot and minor issue
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
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
64429a8711e121e5d5d93d970c5ed3492332dd18Mon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Thu, 6 Jun 2019 14:22:32 +0800
Subject: [PATCH] ASoC: rt1011: fix warning reported by kbuild test robot and
minor issue
This patch fixes following issues:
- warning: this decimal constant is unsigned only in ISO C90
- sparse: incorrect type in assignment
- check if value.integer.value is zero for "R0 Load Mode" control
--- sound/soc/codecs/rt1011.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
sound/soc/codecs/rt1011.c +7 -4
@@ -1145,8 +1145,8 @@ static int rt1011_bq_drc_coeff_get(struct snd_kcontrol *kcontrol, bq_drc_info = rt1011->bq_drc_params[mode_idx];for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) { - params[i].reg =cpu_to_le16 (bq_drc_info[i].reg); - params[i].val =cpu_to_le16 (bq_drc_info[i].val); + params[i].reg = bq_drc_info[i].reg; + params[i].val = bq_drc_info[i].val; }return 0 ;
@@ -1187,8 +1187,8 @@ static int rt1011_bq_drc_coeff_put(struct snd_kcontrol *kcontrol,pr_info ("%s, id.name=%s, mode_idx=%d\n" , __func__, ucontrol->id.name, mode_idx);for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) { - bq_drc_info[i].reg =le16_to_cpu (params[i].reg); - bq_drc_info[i].val =le16_to_cpu (params[i].val); + bq_drc_info[i].reg = params[i].reg; + bq_drc_info[i].val = params[i].val; }for (i =0 ; i <RT1011_BQ_DRC_NUM ; i++) {
@@ -1284,6 +1284,9 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol,if (!component->card->instantiated)return 0 ; +if (ucontrol->value.integer.value[0 ] ==0 ) +return -EINVAL ; + dev =regmap_get_device (rt1011->regmap);if (snd_soc_component_get_bias_level (component) ==SND_SOC_BIAS_OFF ) { rt1011->r0_reg = ucontrol->value.integer.value[0 ];
Signature · 1 line
2.20.1