xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ti: 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/87blkpxxip.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:55:59 +09:00
committed by Mark Brown
parent d789710fb2
commit 059374fe9e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/ti/ams-delta.c
View File

@@ -420,7 +420,7 @@ static struct snd_soc_ops ams_delta_ops;
* Shares hardware with codec config pulse generation */ * Shares hardware with codec config pulse generation */
static bool ams_delta_muted = 1; static bool ams_delta_muted = 1;
static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute) static int ams_delta_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
int apply; int apply;
@@ -439,18 +439,19 @@ static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute)
/* Our codec DAI probably doesn't have its own .ops structure */ /* Our codec DAI probably doesn't have its own .ops structure */
static const struct snd_soc_dai_ops ams_delta_dai_ops = { static const struct snd_soc_dai_ops ams_delta_dai_ops = {
.digital_mute = ams_delta_digital_mute, .mute_stream = ams_delta_mute,
.no_capture_mute = 1,
}; };
/* Will be used if the codec ever has its own digital_mute function */ /* Will be used if the codec ever has its own digital_mute function */
static int ams_delta_startup(struct snd_pcm_substream *substream) static int ams_delta_startup(struct snd_pcm_substream *substream)
{ {
return ams_delta_digital_mute(NULL, 0); return ams_delta_digital_mute(NULL, 0, substream->stream);
} }
static void ams_delta_shutdown(struct snd_pcm_substream *substream) static void ams_delta_shutdown(struct snd_pcm_substream *substream)
{ {
ams_delta_digital_mute(NULL, 1); ams_delta_digital_mute(NULL, 1, substream->stream);
} }