| Message ID | 20210219230918.5058-4-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: samsung: remove cppcheck warnings | expand |
On Fri, Feb 19, 2021 at 05:09:15PM -0600, Pierre-Louis Bossart wrote: > cppcheck warning: > > sound/soc/samsung/smdk_wm8994.c:179:6: style: Variable 'ret' is > reassigned a value before the old one has been > used. [redundantAssignment] > ret = devm_snd_soc_register_card(&pdev->dev, card); > ^ > sound/soc/samsung/smdk_wm8994.c:166:8: note: ret is assigned > ret = -EINVAL; > ^ > sound/soc/samsung/smdk_wm8994.c:179:6: note: ret is overwritten > ret = devm_snd_soc_register_card(&pdev->dev, card); > ^ > > The initial authors bothered to set ret to -EINVAL and throw a > dev_err() message, so it looks like there is a missing return to avoid > continuing if the property is missing. Good catch. It's a required property. Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 681b244d5312..39a7a449f554 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -164,6 +164,7 @@ static int smdk_audio_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'samsung,i2s-controller' missing or invalid\n"); ret = -EINVAL; + return ret; } smdk_dai[0].platforms->name = NULL;
cppcheck warning: sound/soc/samsung/smdk_wm8994.c:179:6: style: Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment] ret = devm_snd_soc_register_card(&pdev->dev, card); ^ sound/soc/samsung/smdk_wm8994.c:166:8: note: ret is assigned ret = -EINVAL; ^ sound/soc/samsung/smdk_wm8994.c:179:6: note: ret is overwritten ret = devm_snd_soc_register_card(&pdev->dev, card); ^ The initial authors bothered to set ret to -EINVAL and throw a dev_err() message, so it looks like there is a missing return to avoid continuing if the property is missing. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/samsung/smdk_wm8994.c | 1 + 1 file changed, 1 insertion(+)