diff options
author | Mark Brown <broonie@kernel.org> | 2021-03-01 23:31:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-03-10 13:07:23 +0000 |
commit | 893bc891d39d17bac05fc242ffacfe516e7791fb (patch) | |
tree | d1f76b291b7c2ff2a11e6848bf2c342b12b5f832 /sound/soc/qcom/qdsp6/q6afe-dai.c | |
parent | 2b719fd20f327f81270b0ab99159f61da3bbac34 (diff) | |
parent | 4b4f2119f98518c86c5651771ad9db9070c76de4 (diff) |
Merge series "ASoC: qcom: remove cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Second batch of cleanups for Qualcomm SOCs and codecs. The only
functional change is the addition of a missing error check in the last
patch.
Pierre-Louis Bossart (10):
ASoC: qcom: lpass-hdmi: remove useless return
ASoC: qcom: lpass-platform: remove useless assignment
ASoC: qcom: q6dsp-dai: clarify expression
ASoC: qcom: q6afe: remove useless assignments
ASoC: qcom: q6afe: align function prototype
ASoC: qcom: q6asm: align function prototypes
ASoC: wcd-clsh-v2: align function prototypes
ASoC: wcd9335: clarify return value
ASoC: wcd934x: remove useless return
ASoC: lpass-wsa-macro: add missing test
sound/soc/codecs/lpass-wsa-macro.c | 2 ++
sound/soc/codecs/wcd-clsh-v2.h | 6 +++---
sound/soc/codecs/wcd9335.c | 2 +-
sound/soc/codecs/wcd934x.c | 2 --
sound/soc/qcom/lpass-hdmi.c | 4 ----
sound/soc/qcom/lpass-platform.c | 2 +-
sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +-
sound/soc/qcom/qdsp6/q6afe.c | 5 ++---
sound/soc/qcom/qdsp6/q6afe.h | 2 +-
sound/soc/qcom/qdsp6/q6asm.h | 6 +++---
10 files changed, 14 insertions(+), 19 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/qcom/qdsp6/q6afe-dai.c')
-rw-r--r-- | sound/soc/qcom/qdsp6/q6afe-dai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index e8915519f427..b539af86e8f7 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -261,7 +261,7 @@ static int q6tdm_set_tdm_slot(struct snd_soc_dai *dai, tdm->nslots_per_frame = slots; tdm->slot_width = slot_width; /* TDM RX dais ids are even and tx are odd */ - tdm->slot_mask = (dai->id & 0x1 ? tx_mask : rx_mask) & cap_mask; + tdm->slot_mask = ((dai->id & 0x1) ? tx_mask : rx_mask) & cap_mask; break; default: dev_err(dai->dev, "%s: invalid dai id 0x%x\n", |