[alsa-devel] [PATCH 4/4] ASoC: Use dai_fmt in z2 machine driver

[Haojian Zhuang]

On Fri, Dec 30, 2011 at 11:44 PM, Axel Lin <axel.lin at gmail.com> wrote:
> Signed-off-by: Axel Lin <axel.lin at gmail.com>
> ---
>  sound/soc/pxa/z2.c |   14 ++------------
>  1 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
> index d6807e0..e8f15ce 100644
> --- a/sound/soc/pxa/z2.c
> +++ b/sound/soc/pxa/z2.c
> @@ -56,18 +56,6 @@ static int z2_hw_params(struct snd_pcm_substream *substream,
>                break;
>        }
>
> -       /* set codec DAI configuration */
> -       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
> -               SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
> -       if (ret < 0)
> -               return ret;
> -
> -       /* set cpu DAI configuration */
> -       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
> -               SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
> -       if (ret < 0)
> -               return ret;
> -
>        /* set the codec system clock for DAC and ADC */
>        ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,
>                SND_SOC_CLOCK_IN);
> @@ -196,6 +184,8 @@ static struct snd_soc_dai_link z2_dai = {
>        .platform_name = "pxa-pcm-audio",
>        .codec_name     = "wm8750.0-001b",
>        .init           = z2_wm8750_init,
> +       .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
> +                         SND_SOC_DAIFMT_CBS_CFS,
>        .ops            = &z2_ops,
>  };
>
> --
Acked-by: Haojian Zhuang <haojian.zhuang at gmail.com>