[PATCH 05/19] ASoC: atmel: merge .digital_mute() into .mute_stream()

[Alexandre Belloni]

On 23/06/2020 10:19:56+0900, Kuninori Morimoto wrote:
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx at 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 at renesas.com>

Reviewed-by: Alexandre Belloni <alexandre.belloni at bootlin.com>

> ---
>  sound/soc/atmel/atmel-classd.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
> index e98601eccfa3..59231c0371b8 100644
> --- a/sound/soc/atmel/atmel-classd.c
> +++ b/sound/soc/atmel/atmel-classd.c
> @@ -327,12 +327,16 @@ 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;
>  
> +	if (direction != SNDRV_PCM_STREAM_PLAYBACK)
> +		return 0;
> +
>  	mask = CLASSD_MR_LMUTE_MASK | CLASSD_MR_RMUTE_MASK;
>  
>  	if (mute)
> @@ -469,7 +473,7 @@ 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,
> -- 
> 2.25.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com