[v3,07/21] ASoC: atmel: merge .digital_mute() into .mute_stream()
diff mbox series

Message ID 877dvdxxi8.wl-kuninori.morimoto.gx@renesas.com
State New
Headers show
Series
  • ASoC: merge .digital_mute() into .mute_stream()
Related show

Commit Message

Kuninori Morimoto July 9, 2020, 1:56 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 sound/soc/atmel/atmel-classd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Mark Brown July 16, 2020, 8:44 p.m. UTC | #1
On Thu, Jul 09, 2020 at 10:56:15AM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> 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.

At least this patch needs a rebase against current code, possibly others.
Kuninori Morimoto July 16, 2020, 11:27 p.m. UTC | #2
Hi Mark

> > 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.
> 
> At least this patch needs a rebase against current code, possibly others.

I noticed it yesterday.
OK, I will rebase and re-post v4

Thank you for your help !!

Best regards
---
Kuninori Morimoto
Mark Brown July 16, 2020, 11:59 p.m. UTC | #3
On Fri, Jul 17, 2020 at 08:27:46AM +0900, Kuninori Morimoto wrote:

> > > 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.

> > At least this patch needs a rebase against current code, possibly others.

> I noticed it yesterday.
> OK, I will rebase and re-post v4

Turned out it was just that one - everything else (except the final
removal patches) was fine, git fixed up the remaining issues itself.

> Thank you for your help !!

Thank you for your hard work!

Patch
diff mbox series

diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index e98601eccfa3..5deabb506a79 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -327,8 +327,8 @@  static int atmel_classd_codec_dai_startup(struct snd_pcm_substream *substream,
 	return clk_prepare_enable(dd->gclk);
 }
 
-static int atmel_classd_codec_dai_digital_mute(struct snd_soc_dai *codec_dai,
-	int mute)
+static int atmel_classd_codec_dai_mute(struct snd_soc_dai *codec_dai,
+				       int mute, int direction)
 {
 	struct snd_soc_component *component = codec_dai->component;
 	u32 mask, val;
@@ -469,12 +469,13 @@  static int atmel_classd_codec_dai_trigger(struct snd_pcm_substream *substream,
 }
 
 static const struct snd_soc_dai_ops atmel_classd_codec_dai_ops = {
-	.digital_mute	= atmel_classd_codec_dai_digital_mute,
+	.mute_stream	= atmel_classd_codec_dai_mute,
 	.startup	= atmel_classd_codec_dai_startup,
 	.shutdown	= atmel_classd_codec_dai_shutdown,
 	.hw_params	= atmel_classd_codec_dai_hw_params,
 	.prepare	= atmel_classd_codec_dai_prepare,
 	.trigger	= atmel_classd_codec_dai_trigger,
+	.no_capture_mute = 1,
 };
 
 #define ATMEL_CLASSD_CODEC_DAI_NAME  "atmel-classd-hifi"