Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: meson: merge .digital_mute() into .mute_stream()

snd_soc_dai_digital_mute() is internally using both
mute_stream() (1) or digital_mute() (2), but the difference between
these 2 are only handling direction.
We can merge digital_mute() into mute_stream

int snd_soc_dai_digital_mute(xxx, int direction)
{
...
else if (dai->driver->ops->mute_stream)
(1) return dai->driver->ops->mute_stream(xxx, direction);
else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
dai->driver->ops->digital_mute)
(2) return dai->driver->ops->digital_mute(xxx);
...
}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/878sftxxie.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
f795ff78 1ff12396

+3 -2
+3 -2
sound/soc/meson/axg-spdifout.c
··· 108 108 } 109 109 } 110 110 111 - static int axg_spdifout_digital_mute(struct snd_soc_dai *dai, int mute) 111 + static int axg_spdifout_mute(struct snd_soc_dai *dai, int mute, int direction) 112 112 { 113 113 struct axg_spdifout *priv = snd_soc_dai_get_drvdata(dai); 114 114 ··· 285 285 286 286 static const struct snd_soc_dai_ops axg_spdifout_ops = { 287 287 .trigger = axg_spdifout_trigger, 288 - .digital_mute = axg_spdifout_digital_mute, 288 + .mute_stream = axg_spdifout_mute, 289 289 .hw_params = axg_spdifout_hw_params, 290 290 .startup = axg_spdifout_startup, 291 291 .shutdown = axg_spdifout_shutdown, 292 + .no_capture_mute = 1, 292 293 }; 293 294 294 295 static struct snd_soc_dai_driver axg_spdifout_dai_drv[] = {