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

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


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

sound/soc/codecs/ak4458.c

+3 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int ak4458_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 


static const int att_speed[] = { 4080, 2040, 510, 255 };



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

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

{

	struct snd_soc_component *component = dai->component;

	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);
@@ -495,8 +495,9 @@ static const struct snd_soc_dai_ops ak4458_dai_ops = { 
	.startup        = ak4458_startup,

	.hw_params	= ak4458_hw_params,

	.set_fmt	= ak4458_set_dai_fmt,

	.digital_mute	= ak4458_set_dai_mute,

	.mute_stream	= ak4458_set_dai_mute,

	.set_tdm_slot	= ak4458_set_tdm_slot,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ak4458_dai = {

sound/soc/codecs/ak4535.c

+4 −2
Original line number Diff line number Diff line
@@ -309,10 +309,11 @@ static int ak4535_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return 0;

}



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

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

{

	struct snd_soc_component *component = dai->component;

	u16 mute_reg = snd_soc_component_read(component, AK4535_DAC);



	if (!mute)

		snd_soc_component_write(component, AK4535_DAC, mute_reg & ~0x20);

	else
@@ -348,8 +349,9 @@ static int ak4535_set_bias_level(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops ak4535_dai_ops = {

	.hw_params	= ak4535_hw_params,

	.set_fmt	= ak4535_set_dai_fmt,

	.digital_mute	= ak4535_mute,

	.mute_stream	= ak4535_mute,

	.set_sysclk	= ak4535_set_dai_sysclk,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ak4535_dai = {

sound/soc/codecs/ak4641.c

+5 −3
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int ak4641_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return snd_soc_component_write(component, AK4641_MODE1, mode1);

}



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

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

{

	struct snd_soc_component *component = dai->component;
@@ -467,15 +467,17 @@ static int ak4641_set_bias_level(struct snd_soc_component *component, 
static const struct snd_soc_dai_ops ak4641_i2s_dai_ops = {

	.hw_params    = ak4641_i2s_hw_params,

	.set_fmt      = ak4641_i2s_set_dai_fmt,

	.digital_mute = ak4641_mute,

	.mute_stream  = ak4641_mute,

	.set_sysclk   = ak4641_set_dai_sysclk,

	.no_capture_mute = 1,

};



static const struct snd_soc_dai_ops ak4641_pcm_dai_ops = {

	.hw_params    = NULL, /* rates are controlled by BT chip */

	.set_fmt      = ak4641_pcm_set_dai_fmt,

	.digital_mute = ak4641_mute,

	.mute_stream  = ak4641_mute,

	.set_sysclk   = ak4641_set_dai_sysclk,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver ak4641_dai[] = {