wcd9335: Remove unnecessary null checks in wcd9335_set_channel_map
Subsystems (3)
PATCH 1/1 wcd9335: Remove unnecessary null checks in wcd9335_set_channel_map
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 <[email protected]>
--- sound/soc/codecs/wcd9335.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
sound/soc/codecs/wcd9335.c +8 -12
@@ -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 ;
Signature · 1 line
2.20.1
Thanks for the patch!
Quoted 10 lines · Nathan Chancellor
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) { ~~ ~~~~~^~~~~~
Quoted 5 lines
2 warnings generated.
Fixes 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec")Signed-off-by Nathan Chancellor <[email protected]>---