ASoC: rt5663: refine error handling
The newly added rt5663 codec driver introduces a couple of warnings
when built with -Wmaybe-uninitialized:
codecs/rt5663.c: In function 'rt5663_set_tdm_slot':
codecs/rt5663.c:2680:2: error: 'reg' may be used uninitialized in this function [-Werror=maybe-uninitialized]
codecs/rt5663.c: In function 'rt5663_set_dai_pll':
codecs/rt5663.c:2556:12: error: 'shift' may be used uninitialized in this function [-Werror=maybe-uninitialized]
codecs/rt5663.c:2596:2: error: 'mask' may be used uninitialized in this function [-Werror=maybe-uninitialized]
We can avoid those warnings by always returning an error
from the switch() statements instead of falling through
with an uninitialized variable when we hit an unexpected
case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: df7c52168e
("ASoC: add rt5663 codec driver")
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
df7c52168e
commit
56efaed524
|
@ -1831,6 +1831,7 @@ static int rt5663_i2s_use_asrc(struct snd_soc_dapm_widget *source,
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (da_asrc_en || ad_asrc_en)
|
if (da_asrc_en || ad_asrc_en)
|
||||||
|
@ -2579,6 +2580,7 @@ static int rt5663_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (source) {
|
switch (source) {
|
||||||
|
@ -2674,6 +2676,7 @@ static int rt5663_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
dev_err(codec->dev, "Unknown CODEC_TYPE\n");
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_soc_update_bits(codec, reg, RT5668_TDM_MODE_MASK |
|
snd_soc_update_bits(codec, reg, RT5668_TDM_MODE_MASK |
|
||||||
|
|
Loading…
Reference in a new issue