diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-07-17 09:21:54 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-20 12:39:24 +0100 |
| commit | e2978c45e5ed3bab7f69477b882ef588185b30cc (patch) | |
| tree | dac55e9c5cd49793ce28ff83be631d1c17a2b9a5 | |
| parent | 22e9b54307987787efa0ee534aa9e31982ec1161 (diff) | |
ASoC: soc-dai: remove .digital_mute
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>
Link: https://lore.kernel.org/r/87h7u72dqz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dai.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 05775f7b0bbc..2b51e8eb8a7a 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); } |