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

ASoC: codecs: tas*: 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/873661xxhu.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/tas2552.c

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

}



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

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

{

	u8 cfg1_reg = 0;

	struct snd_soc_component *component = dai->component;
@@ -519,7 +519,8 @@ static const struct snd_soc_dai_ops tas2552_speaker_dai_ops = { 
	.set_sysclk	= tas2552_set_dai_sysclk,

	.set_fmt	= tas2552_set_dai_fmt,

	.set_tdm_slot	= tas2552_set_dai_tdm_slot,

	.digital_mute = tas2552_mute,

	.mute_stream	= tas2552_mute,

	.no_capture_mute = 1,

};



/* Formats supported by TAS2552 driver. */

sound/soc/codecs/tas2562.c

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

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -612,7 +612,8 @@ static const struct snd_soc_dai_ops tas2562_speaker_dai_ops = { 
	.hw_params	= tas2562_hw_params,

	.set_fmt	= tas2562_set_dai_fmt,

	.set_tdm_slot	= tas2562_set_dai_tdm_slot,

	.digital_mute	= tas2562_mute,

	.mute_stream	= tas2562_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver tas2562_dai[] = {

sound/soc/codecs/tas2770.c

+3 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static const struct snd_soc_dapm_route tas2770_audio_map[] = { 
	{"VSENSE", "Switch", "VMON"},

};



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

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

{

	struct snd_soc_component *component = dai->component;

	int ret;
@@ -530,10 +530,11 @@ static int tas2770_set_dai_tdm_slot(struct snd_soc_dai *dai, 
}



static struct snd_soc_dai_ops tas2770_dai_ops = {

	.digital_mute = tas2770_mute,

	.mute_stream = tas2770_mute,

	.hw_params  = tas2770_hw_params,

	.set_fmt    = tas2770_set_fmt,

	.set_tdm_slot = tas2770_set_dai_tdm_slot,

	.no_capture_mute = 1,

};



#define TAS2770_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

sound/soc/codecs/tas571x.c

+3 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int tas571x_hw_params(struct snd_pcm_substream *substream, 
				  TAS571X_SDI_FMT_MASK, val);

}



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

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

{

	struct snd_soc_component *component = dai->component;

	u8 sysctl2;
@@ -354,7 +354,8 @@ static int tas571x_set_bias_level(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops tas571x_dai_ops = {

	.set_fmt	= tas571x_set_dai_fmt,

	.hw_params	= tas571x_hw_params,

	.digital_mute	= tas571x_mute,

	.mute_stream	= tas571x_mute,

	.no_capture_mute = 1,

};

sound/soc/codecs/tas5720.c

+3 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int tas5720_set_dai_tdm_slot(struct snd_soc_dai *dai, 
	return ret;

}



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

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

{

	struct snd_soc_component *component = dai->component;

	int ret;
@@ -604,7 +604,8 @@ static const struct snd_soc_dai_ops tas5720_speaker_dai_ops = { 
	.hw_params	= tas5720_hw_params,

	.set_fmt	= tas5720_set_dai_fmt,

	.set_tdm_slot	= tas5720_set_dai_tdm_slot,

	.digital_mute	= tas5720_mute,

	.mute_stream	= tas5720_mute,

	.no_capture_mute = 1,

};



/*