iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: wcd934x: Remove some unnecessary NULL checks

Browse Source 
Clang warns:

../sound/soc/codecs/wcd934x.c:1886:11: warning: address of array
'wcd->rx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion]
        if (wcd->rx_chs) {
        ~~  ~~~~~^~~~~~
../sound/soc/codecs/wcd934x.c:1894:11: warning: address of array
'wcd->tx_chs' will always evaluate to 'true' [-Wpointer-bool-conversion]
        if (wcd->tx_chs) {
        ~~  ~~~~~^~~~~~
2 warnings generated.

Arrays that are in the middle of a struct are never NULL so they don't
need a check like this.

Fixes: a61f3b4f476e ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec")
Link: https://github.com/ClangBuiltLinux/linux/issues/854
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://lore.kernel.org/r/20200204060143.23393-1-natechancellor@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Nathan Chancellor 2020-02-03 23:01:44 -07:00 committed by Mark Brown
parent d2cff47045
commit 918d0aba86
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/codecs/wcd934x.c
View File

@ -1883,20 +1883,16 @@ static int wcd934x_set_channel_map(struct snd_soc_dai *dai,
return -EINVAL; return -EINVAL;
} }
if (wcd->rx_chs) { wcd->num_rx_port = rx_num;
wcd->num_rx_port = rx_num; for (i = 0; i < rx_num; i++) {
for (i = 0; i < rx_num; i++) { wcd->rx_chs[i].ch_num = rx_slot[i];
wcd->rx_chs[i].ch_num = rx_slot[i]; INIT_LIST_HEAD(&wcd->rx_chs[i].list);
INIT_LIST_HEAD(&wcd->rx_chs[i].list);
}
} }
if (wcd->tx_chs) { wcd->num_tx_port = tx_num;
wcd->num_tx_port = tx_num; for (i = 0; i < tx_num; i++) {
for (i = 0; i < tx_num; i++) { wcd->tx_chs[i].ch_num = tx_slot[i];
wcd->tx_chs[i].ch_num = tx_slot[i]; INIT_LIST_HEAD(&wcd->tx_chs[i].list);
INIT_LIST_HEAD(&wcd->tx_chs[i].list);
}
} }
return 0; return 0;