[alsa-devel] [PATCH] ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops

[Opensource [Adam Thomson]]

On 15 July, 2015 02:52, Axel Lin wrote:

> da732x_dai1_ops is identical to da732x_dai2_ops, so merge them to
> da732x_dai_ops. The da732x_dai_ops is not modified after initialization,
> so make it const.
> 
> Signed-off-by: Axel Lin <axel.lin at ingics.com>
> ---
>  sound/soc/codecs/da732x.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
> index b1cb465..29251b0 100644
> --- a/sound/soc/codecs/da732x.c
> +++ b/sound/soc/codecs/da732x.c
> @@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai,
> int clk_id,
>  #define	DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |
> SNDRV_PCM_FMTBIT_S20_3LE | \
>  			SNDRV_PCM_FMTBIT_S24_LE |
> SNDRV_PCM_FMTBIT_S32_LE)
> 
> -static struct snd_soc_dai_ops da732x_dai1_ops = {
> -	.hw_params	= da732x_hw_params,
> -	.set_fmt	= da732x_set_dai_fmt,
> -	.set_sysclk	= da732x_set_dai_sysclk,
> -};
> -
> -static struct snd_soc_dai_ops da732x_dai2_ops = {
> +static const struct snd_soc_dai_ops da732x_dai_ops = {
>  	.hw_params	= da732x_hw_params,
>  	.set_fmt	= da732x_set_dai_fmt,
>  	.set_sysclk	= da732x_set_dai_sysclk,
> @@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
>  			.rates = DA732X_RATES,
>  			.formats = DA732X_FORMATS,
>  		},
> -		.ops = &da732x_dai1_ops,
> +		.ops = &da732x_dai_ops,
>  	},
>  	{
>  		.name	= "DA732X_AIFB",
> @@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
>  			.rates = DA732X_RATES,
>  			.formats = DA732X_FORMATS,
>  		},
> -		.ops = &da732x_dai2_ops,
> +		.ops = &da732x_dai_ops,
>  	},
>  };
> 
> --
> 2.1.0
> 
> 

Acked-by: Adam Thomson <Adam.Thomson.Opensource at diasemi.com>