From: Kuninori Morimoto Date: Wed, 8 Jan 2025 03:05:52 +0000 (+0000) Subject: ASoC: soc-card: remove card check X-Git-Tag: v6.14-rc1~111^2~7^2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c3d68ce5dee76f30b23ca29b2be4774e291f7f1;p=thirdparty%2Fkernel%2Flinux.git ASoC: soc-card: remove card check only snd_soc_card_set_bias_level() and snd_soc_card_set_bias_level_post() are checking "card" in the function, like below int snd_soc_card_set_bias_level(...) { ... => if (card && card->xxx) ret = card->xxxx(...); ... } But it should already have been an error if "card" was NULL. remove "card" NULL check here. Otherwise it will get waring on smatch without this patch. This is prepare for error check cleanup. Signed-off-by: Kuninori Morimoto Link: https://patch.msgid.link/87msg2knsg.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-card.c b/sound/soc/soc-card.c index 8e9546fe74281..e6eb71b3010a8 100644 --- a/sound/soc/soc-card.c +++ b/sound/soc/soc-card.c @@ -219,7 +219,7 @@ int snd_soc_card_set_bias_level(struct snd_soc_card *card, { int ret = 0; - if (card && card->set_bias_level) + if (card->set_bias_level) ret = card->set_bias_level(card, dapm, level); return soc_card_ret(card, ret); @@ -231,7 +231,7 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card, { int ret = 0; - if (card && card->set_bias_level_post) + if (card->set_bias_level_post) ret = card->set_bias_level_post(card, dapm, level); return soc_card_ret(card, ret);