diff mbox series

[v4,1/3] ASoC: soc-dai: remove .digital_mute

Message ID 87h7u72dqz.wl-kuninori.morimoto.gx@renesas.com (mailing list archive)
State New, archived
Headers show
Series ASoC: merge .digital_mute() into .mute_stream() | expand

Commit Message

Kuninori Morimoto July 17, 2020, 12:21 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

All drivers are now using .mute_stream.
Let's remove .digital_mute.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 include/sound/soc-dai.h | 1 -
 sound/soc/soc-dai.c     | 4 ----
 2 files changed, 5 deletions(-)
diff mbox series

Patch

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e0e061b8e9bd..2c5a49411276 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -246,7 +246,6 @@  struct snd_soc_dai_ops {
 	 * DAI digital mute - optional.
 	 * Called by soc-core to minimise any pops.
 	 */
-	int (*digital_mute)(struct snd_soc_dai *dai, int mute);
 	int (*mute_stream)(struct snd_soc_dai *dai, int mute, int stream);
 
 	/*
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 458d2ea44329..c89a1929d141 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -307,10 +307,6 @@  int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,
 	    (direction == SNDRV_PCM_STREAM_PLAYBACK ||
 	     !dai->driver->ops->no_capture_mute))
 		ret = dai->driver->ops->mute_stream(dai, mute, direction);
-	else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
-		 dai->driver->ops &&
-		 dai->driver->ops->digital_mute)
-		ret = dai->driver->ops->digital_mute(dai, mute);
 
 	return soc_dai_ret(dai, ret);
 }