iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: codecs: alc*: merge .digital_mute() into .mute_stream()

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87wo3dwiwv.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-07-09 10:56:48 +09:00 committed by Mark Brown
parent 18e028e22e
commit 4c66c2fc10
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/alc5623.c
View File

@ -737,7 +737,7 @@ static int alc5623_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int alc5623_mute(struct snd_soc_dai *dai, int mute) static int alc5623_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
u16 hp_mute = ALC5623_MISC_M_DAC_L_INPUT | ALC5623_MISC_M_DAC_R_INPUT; u16 hp_mute = ALC5623_MISC_M_DAC_L_INPUT | ALC5623_MISC_M_DAC_R_INPUT;
@ -829,10 +829,11 @@ static int alc5623_set_bias_level(struct snd_soc_component *component,
static const struct snd_soc_dai_ops alc5623_dai_ops = { static const struct snd_soc_dai_ops alc5623_dai_ops = {
.hw_params = alc5623_pcm_hw_params, .hw_params = alc5623_pcm_hw_params,
.digital_mute = alc5623_mute, .mute_stream = alc5623_mute,
.set_fmt = alc5623_set_dai_fmt, .set_fmt = alc5623_set_dai_fmt,
.set_sysclk = alc5623_set_dai_sysclk, .set_sysclk = alc5623_set_dai_sysclk,
.set_pll = alc5623_set_dai_pll, .set_pll = alc5623_set_dai_pll,
.no_capture_mute = 1,
}; };
static struct snd_soc_dai_driver alc5623_dai = { static struct snd_soc_dai_driver alc5623_dai = {

5
sound/soc/codecs/alc5632.c
View File

@ -902,7 +902,7 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int alc5632_mute(struct snd_soc_dai *dai, int mute) static int alc5632_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L
@ -1005,10 +1005,11 @@ static int alc5632_set_bias_level(struct snd_soc_component *component,
static const struct snd_soc_dai_ops alc5632_dai_ops = { static const struct snd_soc_dai_ops alc5632_dai_ops = {
.hw_params = alc5632_pcm_hw_params, .hw_params = alc5632_pcm_hw_params,
.digital_mute = alc5632_mute, .mute_stream = alc5632_mute,
.set_fmt = alc5632_set_dai_fmt, .set_fmt = alc5632_set_dai_fmt,
.set_sysclk = alc5632_set_dai_sysclk, .set_sysclk = alc5632_set_dai_sysclk,
.set_pll = alc5632_set_dai_pll, .set_pll = alc5632_set_dai_pll,
.no_capture_mute = 1,
}; };
static struct snd_soc_dai_driver alc5632_dai = { static struct snd_soc_dai_driver alc5632_dai = {