OSDN Git Service

ASoC: atmel: merge .digital_mute() into .mute_stream()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 17 Jul 2020 00:23:51 +0000 (09:23 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 17 Jul 2020 13:22:55 +0000 (14:22 +0100)
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>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/87eepb2dnq.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/atmel/atmel-classd.c

index 2d35b08..0469f50 100644 (file)
@@ -288,8 +288,8 @@ static int atmel_classd_component_resume(struct snd_soc_component *component)
        return regcache_sync(dd->regmap);
 }
 
-static int atmel_classd_cpu_dai_digital_mute(struct snd_soc_dai *cpu_dai,
-                                            int mute)
+static int atmel_classd_cpu_dai_mute_stream(struct snd_soc_dai *cpu_dai,
+                                           int mute, int direction)
 {
        struct snd_soc_component *component = cpu_dai->component;
        u32 mask, val;
@@ -432,10 +432,11 @@ static int atmel_classd_cpu_dai_trigger(struct snd_pcm_substream *substream,
 static const struct snd_soc_dai_ops atmel_classd_cpu_dai_ops = {
        .startup        = atmel_classd_cpu_dai_startup,
        .shutdown       = atmel_classd_cpu_dai_shutdown,
-       .digital_mute   = atmel_classd_cpu_dai_digital_mute,
+       .mute_stream    = atmel_classd_cpu_dai_mute_stream,
        .hw_params      = atmel_classd_cpu_dai_hw_params,
        .prepare        = atmel_classd_cpu_dai_prepare,
        .trigger        = atmel_classd_cpu_dai_trigger,
+       .no_capture_mute = 1,
 };
 
 static struct snd_soc_dai_driver atmel_classd_cpu_dai = {