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

ASoC: codecs: da*: 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>
Reviewed-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Link: https://lore.kernel.org/r/87sge1wiwi.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/da7210.c

+3 −2
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) 
	return 0;

}



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

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

{

	struct snd_soc_component *component = dai->component;

	u8 mute_reg = snd_soc_component_read(component, DA7210_DAC_HPF) & 0xFB;
@@ -1036,7 +1036,8 @@ static const struct snd_soc_dai_ops da7210_dai_ops = { 
	.set_fmt	= da7210_set_dai_fmt,

	.set_sysclk	= da7210_set_dai_sysclk,

	.set_pll	= da7210_set_dai_pll,

	.digital_mute	= da7210_mute,

	.mute_stream	= da7210_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver da7210_dai = {

sound/soc/codecs/da7213.c

+3 −2
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	return 0;

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -1528,7 +1528,8 @@ static int da7213_set_component_pll(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops da7213_dai_ops = {

	.hw_params	= da7213_hw_params,

	.set_fmt	= da7213_set_dai_fmt,

	.digital_mute	= da7213_mute,

	.mute_stream	= da7213_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver da7213_dai = {

sound/soc/codecs/da9055.c

+3 −2
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static int da9055_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	return 0;

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -1324,7 +1324,8 @@ static const struct snd_soc_dai_ops da9055_dai_ops = { 
	.set_fmt	= da9055_set_dai_fmt,

	.set_sysclk	= da9055_set_dai_sysclk,

	.set_pll	= da9055_set_dai_pll,

	.digital_mute	= da9055_mute,

	.mute_stream	= da9055_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver da9055_dai = {