[alsa-devel] [PATCH] ASoC: Convert Goni to data based DAPM init

Kyungmin Park kmpark at infradead.org
Tue Oct 11 08:10:29 CEST 2011


Acked-by: Kyungmin Park <kyungmin.park at samsung.com>

On Sat, Oct 8, 2011 at 8:02 PM, Mark Brown
<broonie at opensource.wolfsonmicro.com> wrote:
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/samsung/goni_wm8994.c |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
> index dcaf656..60ed59b 100644
> --- a/sound/soc/samsung/goni_wm8994.c
> +++ b/sound/soc/samsung/goni_wm8994.c
> @@ -100,14 +100,6 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
>        struct snd_soc_dapm_context *dapm = &codec->dapm;
>        int ret;
>
> -       /* add goni specific widgets */
> -       snd_soc_dapm_new_controls(dapm, goni_dapm_widgets,
> -                       ARRAY_SIZE(goni_dapm_widgets));
> -
> -       /* set up goni specific audio routes */
> -       snd_soc_dapm_add_routes(dapm, goni_dapm_routes,
> -                       ARRAY_SIZE(goni_dapm_routes));
> -
>        /* set endpoints to not connected */
>        snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
>        snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
> @@ -256,6 +248,11 @@ static struct snd_soc_card goni = {
>        .name = "goni",
>        .dai_link = goni_dai,
>        .num_links = ARRAY_SIZE(goni_dai),
> +
> +       .dapm_widgets = goni_dapm_widgets,
> +       .num_dapm_widgets = ARRAY_SIZE(goni_dapm_widgets),
> +       .dapm_routes = goni_dapm_routes,
> +       .num_dapm_routes = ARRAY_SIZE(goni_dapm_routes),
>  };
>
>  static int __init goni_init(void)
> --
> 1.7.6.3
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>


More information about the Alsa-devel mailing list