| Message ID | 20190129214847.6341-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | wcd9335: Remove unnecessary null checks in wcd9335_set_channel_map | expand |
Thanks for the patch! On 29/01/2019 21:48, Nathan Chancellor wrote: > Clang warns: > > sound/soc/codecs/wcd9335.c:2004:11: warning: address of array > 'wcd->rx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion] > if (wcd->rx_chs) { > ~~ ~~~~~^~~~~~ > sound/soc/codecs/wcd9335.c:2012:11: warning: address of array > 'wcd->tx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion] > if (wcd->tx_chs) { > ~~ ~~~~~^~~~~~ > 2 warnings generated. > > Fixes: 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec") > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 3878187bb512..981f88a5f615 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -2001,20 +2001,16 @@ static int wcd9335_set_channel_map(struct snd_soc_dai *dai, return -EINVAL; } - if (wcd->rx_chs) { - wcd->num_rx_port = rx_num; - for (i = 0; i < rx_num; i++) { - wcd->rx_chs[i].ch_num = rx_slot[i]; - INIT_LIST_HEAD(&wcd->rx_chs[i].list); - } + wcd->num_rx_port = rx_num; + for (i = 0; i < rx_num; i++) { + wcd->rx_chs[i].ch_num = rx_slot[i]; + INIT_LIST_HEAD(&wcd->rx_chs[i].list); } - if (wcd->tx_chs) { - wcd->num_tx_port = tx_num; - for (i = 0; i < tx_num; i++) { - wcd->tx_chs[i].ch_num = tx_slot[i]; - INIT_LIST_HEAD(&wcd->tx_chs[i].list); - } + wcd->num_tx_port = tx_num; + for (i = 0; i < tx_num; i++) { + wcd->tx_chs[i].ch_num = tx_slot[i]; + INIT_LIST_HEAD(&wcd->tx_chs[i].list); } return 0;
Clang warns: sound/soc/codecs/wcd9335.c:2004:11: warning: address of array 'wcd->rx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion] if (wcd->rx_chs) { ~~ ~~~~~^~~~~~ sound/soc/codecs/wcd9335.c:2012:11: warning: address of array 'wcd->tx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion] if (wcd->tx_chs) { ~~ ~~~~~^~~~~~ 2 warnings generated. Fixes: 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec") Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- sound/soc/codecs/wcd9335.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)