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

ASoC: codecs: ssm*: 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/871rllxxhp.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/ssm2518.c

+3 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int ssm2518_hw_params(struct snd_pcm_substream *substream, 
				SSM2518_POWER1_MCS_MASK, mcs << 1);

}



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

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

{

	struct ssm2518 *ssm2518 = snd_soc_component_get_drvdata(dai->component);

	unsigned int val;
@@ -623,9 +623,10 @@ static int ssm2518_startup(struct snd_pcm_substream *substream, 
static const struct snd_soc_dai_ops ssm2518_dai_ops = {

	.startup = ssm2518_startup,

	.hw_params	= ssm2518_hw_params,

	.digital_mute	= ssm2518_mute,

	.mute_stream	= ssm2518_mute,

	.set_fmt	= ssm2518_set_dai_fmt,

	.set_tdm_slot	= ssm2518_set_tdm_slot,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ssm2518_dai = {

sound/soc/codecs/ssm2602.c

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

}



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

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

{

	struct ssm2602_priv *ssm2602 = snd_soc_component_get_drvdata(dai->component);
@@ -505,9 +505,10 @@ static int ssm2602_set_bias_level(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops ssm2602_dai_ops = {

	.startup	= ssm2602_startup,

	.hw_params	= ssm2602_hw_params,

	.digital_mute	= ssm2602_mute,

	.mute_stream	= ssm2602_mute,

	.set_sysclk	= ssm2602_set_dai_sysclk,

	.set_fmt	= ssm2602_set_dai_fmt,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ssm2602_dai = {

sound/soc/codecs/ssm4567.c

+3 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int ssm4567_hw_params(struct snd_pcm_substream *substream, 
				SSM4567_DAC_FS_MASK, dacfs);

}



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

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

{

	struct ssm4567 *ssm4567 = snd_soc_component_get_drvdata(dai->component);

	unsigned int val;
@@ -390,9 +390,10 @@ static int ssm4567_set_bias_level(struct snd_soc_component *component, 


static const struct snd_soc_dai_ops ssm4567_dai_ops = {

	.hw_params	= ssm4567_hw_params,

	.digital_mute	= ssm4567_mute,

	.mute_stream	= ssm4567_mute,

	.set_fmt	= ssm4567_set_dai_fmt,

	.set_tdm_slot	= ssm4567_set_tdm_slot,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ssm4567_dai = {