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

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


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

sound/soc/codecs/cs4265.c

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

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -498,9 +498,10 @@ static int cs4265_set_bias_level(struct snd_soc_component *component, 


static const struct snd_soc_dai_ops cs4265_ops = {

	.hw_params	= cs4265_pcm_hw_params,

	.digital_mute	= cs4265_digital_mute,

	.mute_stream	= cs4265_mute,

	.set_fmt	= cs4265_set_fmt,

	.set_sysclk	= cs4265_set_sysclk,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cs4265_dai[] = {

sound/soc/codecs/cs4270.c

+3 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, 
 * board does not have the MUTEA or MUTEB pins connected to such circuitry,

 * then this function will do nothing.

 */

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

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

{

	struct snd_soc_component *component = dai->component;

	struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);
@@ -471,7 +471,8 @@ static const struct snd_soc_dai_ops cs4270_dai_ops = { 
	.hw_params	= cs4270_hw_params,

	.set_sysclk	= cs4270_set_dai_sysclk,

	.set_fmt	= cs4270_set_dai_fmt,

	.digital_mute	= cs4270_dai_mute,

	.mute_stream	= cs4270_dai_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cs4270_dai = {

sound/soc/codecs/cs42l42.c

+3 −2
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int cs42l42_set_sysclk(struct snd_soc_dai *dai, 
	return 0;

}



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

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

{

	struct snd_soc_component *component = dai->component;

	unsigned int regval;
@@ -909,7 +909,8 @@ static const struct snd_soc_dai_ops cs42l42_ops = { 
	.hw_params	= cs42l42_pcm_hw_params,

	.set_fmt	= cs42l42_set_dai_fmt,

	.set_sysclk	= cs42l42_set_sysclk,

	.digital_mute = cs42l42_digital_mute

	.mute_stream	= cs42l42_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cs42l42_dai = {

sound/soc/codecs/cs42l51.c

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

}



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

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

{

	struct snd_soc_component *component = dai->component;

	int reg;
@@ -511,7 +511,8 @@ static const struct snd_soc_dai_ops cs42l51_dai_ops = { 
	.hw_params      = cs42l51_hw_params,

	.set_sysclk     = cs42l51_set_dai_sysclk,

	.set_fmt        = cs42l51_set_dai_fmt,

	.digital_mute   = cs42l51_dai_mute,

	.mute_stream    = cs42l51_dai_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cs42l51_dai = {

sound/soc/codecs/cs42l52.c

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

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -865,9 +865,10 @@ static int cs42l52_set_bias_level(struct snd_soc_component *component, 


static const struct snd_soc_dai_ops cs42l52_ops = {

	.hw_params	= cs42l52_pcm_hw_params,

	.digital_mute	= cs42l52_digital_mute,

	.mute_stream	= cs42l52_mute,

	.set_fmt	= cs42l52_set_fmt,

	.set_sysclk	= cs42l52_set_sysclk,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cs42l52_dai = {