]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: wcd934x: Remove some unnecessary NULL checks
authorNathan Chancellor <natechancellor@gmail.com>
Tue, 4 Feb 2020 06:01:44 +0000 (23:01 -0700)
committerMark Brown <broonie@kernel.org>
Tue, 11 Feb 2020 11:22:08 +0000 (11:22 +0000)
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>
sound/soc/codecs/wcd934x.c

index 158e878abd6c7df52f8a5dfa9cb079d9be4222b9..e780ecd554d265d74aed0acd4cfb76895e17b6ba 100644 (file)
@@ -1883,20 +1883,16 @@ static int wcd934x_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;