| Message ID | 20190205090927.GA20372@kadam (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ASoC: wcd9335: remove some unnecessary NULL checks | expand |
On 05/02/2019 09:09, Dan Carpenter wrote: > These are arrays, not pointers, and they can't be NULL. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks Dan, There is already a patch on list to fix this: https://patchwork.kernel.org/patch/10787281/ thanks, srini > --- > sound/soc/codecs/wcd9335.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > 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; >
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;
These are arrays, not pointers, and they can't be NULL. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- sound/soc/codecs/wcd9335.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)