Unverified Commit f795ff78 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/878sftxxie.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1ff12396

sound/soc/meson/axg-spdifout.c

+3 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int axg_spdifout_trigger(struct snd_pcm_substream *substream, int cmd, 
	}

}



static int axg_spdifout_digital_mute(struct snd_soc_dai *dai, int mute)

static int axg_spdifout_mute(struct snd_soc_dai *dai, int mute, int direction)

{

	struct axg_spdifout *priv = snd_soc_dai_get_drvdata(dai);
@@ -285,10 +285,11 @@ static void axg_spdifout_shutdown(struct snd_pcm_substream *substream, 


static const struct snd_soc_dai_ops axg_spdifout_ops = {

	.trigger	= axg_spdifout_trigger,

	.digital_mute	= axg_spdifout_digital_mute,

	.mute_stream	= axg_spdifout_mute,

	.hw_params	= axg_spdifout_hw_params,

	.startup	= axg_spdifout_startup,

	.shutdown	= axg_spdifout_shutdown,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver axg_spdifout_dai_drv[] = {