OSDN Git Service

ASoC: soc-dai: remove .digital_mute
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 17 Jul 2020 00:21:54 +0000 (09:21 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 20 Jul 2020 11:39:24 +0000 (12:39 +0100)
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>
include/sound/soc-dai.h
sound/soc/soc-dai.c

index 05775f7..2b51e8e 100644 (file)
@@ -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);
 
        /*
index 458d2ea..c89a192 100644 (file)
@@ -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);
 }