ASoC: wcd9335: remove some unnecessary NULL checks
Subsystems (4)
PATCH 1/1 ASoC: wcd9335: remove some unnecessary NULL checks
These are arrays, not pointers, and they can't be NULL.
Signed-off-by Dan Carpenter <[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.17.1
Quoted 3 lines · Dan Carpenter
These are arrays, not pointers, and they can't be NULL.
Signed-off-by Dan Carpenter <[email protected]>
Thanks Dan,
There is already a patch on list to fix this:
https://patchwork.kernel.org/patch/10787281/
thanks,
srini
Quoted 38 lines
--- 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 ;