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

ASoC: codecs: es*: 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/87tuyhwiwm.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/es8316.c

+3 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



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

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

{

	snd_soc_component_update_bits(dai->component, ES8316_DAC_SET1, 0x20,

			    mute ? 0x20 : 0);
@@ -522,7 +522,8 @@ static const struct snd_soc_dai_ops es8316_ops = { 
	.hw_params = es8316_pcm_hw_params,

	.set_fmt = es8316_set_dai_fmt,

	.set_sysclk = es8316_set_dai_sysclk,

	.digital_mute = es8316_mute,

	.mute_stream = es8316_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver es8316_dai = {

sound/soc/codecs/es8328.c

+3 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static const struct snd_soc_dapm_route es8328_dapm_routes[] = { 
	{ "ROUT2", NULL, "Right Out 2" },

};



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

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

{

	return snd_soc_component_update_bits(dai->component, ES8328_DACCONTROL3,

			ES8328_DACCONTROL3_DACMUTE,
@@ -692,9 +692,10 @@ static int es8328_set_bias_level(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops es8328_dai_ops = {

	.startup	= es8328_startup,

	.hw_params	= es8328_hw_params,

	.digital_mute	= es8328_mute,

	.mute_stream	= es8328_mute,

	.set_sysclk	= es8328_set_sysclk,

	.set_fmt	= es8328_set_dai_fmt,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver es8328_dai = {