Unverified Commit 850ba84b authored May 26, 2020 by Dan Murphy Committed by Mark Brown May 27, 2020

ASoC: tlv320adcx140: Fix warnings when using W=1



Fix the warnings when using the W=1 compiler flag.

sound/soc/codecs/tlv320adcx140.c: In function ‘adcx140_reset’:
sound/soc/codecs/tlv320adcx140.c:570:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
  570 |  int ret = 0;
      |      ^~~

This was set but only used in case where the reset GPIO is not defined.
Have the function return the value of ret.

sound/soc/codecs/tlv320adcx140.c: In function ‘adcx140_codec_probe’:
sound/soc/codecs/tlv320adcx140.c:778:18: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
  778 |  if (bias_source < ADCX140_MIC_BIAS_VAL_VREF ||
      |                  ^
sound/soc/codecs/tlv320adcx140.c:789:18: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
  789 |  if (vref_source < ADCX140_MIC_BIAS_VREF_275V ||

This condition will not occur since if the dt property is not set then
the *_source variable is set to the default value.  So there is no way
that *_source can be less then 0.  Which is what each #define is set to.
The code just needs to make sure that the dt property is not out of the
upper bounds.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200526175247.15309-1-dmurphy@ti.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 920bef64

sound/soc/codecs/tlv320adcx140.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -582,7 +582,7 @@ static int adcx140_reset(struct adcx140_priv *adcx140)
		/* 8.4.2: wait >= 10 ms after entering sleep mode. */
		usleep_range(10000, 100000);

		return 0;
		return ret;
		}

		static int adcx140_hw_params(struct snd_pcm_substream *substream,
		@@ -775,8 +775,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
		if (ret)
		bias_source = ADCX140_MIC_BIAS_VAL_VREF;

		if (bias_source < ADCX140_MIC_BIAS_VAL_VREF \|\|
		bias_source > ADCX140_MIC_BIAS_VAL_AVDD) {
		if (bias_source > ADCX140_MIC_BIAS_VAL_AVDD) {
		dev_err(adcx140->dev, "Mic Bias source value is invalid\n");
		return -EINVAL;
		}
		@@ -786,8 +785,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
		if (ret)
		vref_source = ADCX140_MIC_BIAS_VREF_275V;

		if (vref_source < ADCX140_MIC_BIAS_VREF_275V \|\|
		vref_source > ADCX140_MIC_BIAS_VREF_1375V) {
		if (vref_source > ADCX140_MIC_BIAS_VREF_1375V) {
		dev_err(adcx140->dev, "Mic Bias source value is invalid\n");
		return -EINVAL;
		}