Skip to contentSkip to conversation

ASoC: cs35l56: Remove NULL check from cs35l56_sdw_dai_set_stream()

PATCH In review Richard Fitzgerald 3 participants 3 messages Jun 1, 2023

Subsystems (3)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

PATCH 1/1 ASoC: cs35l56: Remove NULL check from cs35l56_sdw_dai_set_stream()

The dma pointer must be set to the passed stream pointer, even if that pointer is NULL.

Fixes e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")
---
 sound/soc/codecs/cs35l56.c | 3 ---
 1 file changed, 3 deletions(-)
sound/soc/codecs/cs35l56.c +0 -3
index 3c07bd1e959e..c03f9d3c9a13 100644
@@ -704,9 +704,6 @@ static int cs35l56_sdw_dai_hw_free(struct snd_pcm_substream *substream,
 static int cs35l56_sdw_dai_set_stream(struct snd_soc_dai *dai,
 				      void *sdw_stream, int direction)
 {
-	if (!sdw_stream)
-		return 0;
-
 	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);
 
 	return 0;
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Richard Fitzgerald

The dma pointer must be set to the passed stream pointer, even if that pointer is NULL.

Fixes e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")

Yep, good catch, this is what we have for other codecs.

Quoted 18 lines
---
 sound/soc/codecs/cs35l56.c | 3 ---
 1 file changed, 3 deletions(-)
sound/soc/codecs/cs35l56.c +0 -3
index 3c07bd1e959e..c03f9d3c9a13 100644
@@ -704,9 +704,6 @@ static int cs35l56_sdw_dai_hw_free(struct snd_pcm_substream *substream,
 static int cs35l56_sdw_dai_set_stream(struct snd_soc_dai *dai,
 				      void *sdw_stream, int direction)
 {
-	if (!sdw_stream)
-		return 0;
-
 	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);
 
 	return 0;
maintainer
#2 lore raw
In reply to Richard Fitzgerald
Quoted 4 lines · Richard Fitzgerald

The dma pointer must be set to the passed stream pointer, even if that pointer is NULL.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs35l56: Remove NULL check from cs35l56_sdw_dai_set_stream()

      commit: 524306c3764276ce6cc7509908934982ce167039

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark