[alsa-devel] [PATCH 6/8] ASoC: Convert pxa directory to module_platform_driver

[Marek Vasut]

> Factor out some boilerplate code.
> 
> Signed-off-by: Axel Lin <axel.lin at gmail.com>

Looks good to me,

Acked-by: Marek Vasut <marek.vasut at gmail.com>

> ---
>  sound/soc/pxa/hx4700.c         |   13 +------------
>  sound/soc/pxa/mioa701_wm9713.c |   13 +------------
>  sound/soc/pxa/palm27x.c        |   13 +------------
>  sound/soc/pxa/pxa-ssp.c        |   12 +-----------
>  sound/soc/pxa/pxa2xx-ac97.c    |   12 +-----------
>  sound/soc/pxa/pxa2xx-pcm.c     |   12 +-----------
>  6 files changed, 6 insertions(+), 69 deletions(-)
> 
> diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
> index 65c1248..e32afaf 100644
> --- a/sound/soc/pxa/hx4700.c
> +++ b/sound/soc/pxa/hx4700.c
> @@ -236,18 +236,7 @@ static struct platform_driver hx4700_audio_driver = {
>  	.remove	= __devexit_p(hx4700_audio_remove),
>  };
> 
> -static int __init hx4700_modinit(void)
> -{
> -	return platform_driver_register(&hx4700_audio_driver);
> -}
> -module_init(hx4700_modinit);
> -
> -static void __exit hx4700_modexit(void)
> -{
> -	platform_driver_unregister(&hx4700_audio_driver);
> -}
> -
> -module_exit(hx4700_modexit);
> +module_platform_driver(hx4700_audio_driver);
> 
>  MODULE_AUTHOR("Philipp Zabel");
>  MODULE_DESCRIPTION("ALSA SoC iPAQ hx4700");
> diff --git a/sound/soc/pxa/mioa701_wm9713.c
> b/sound/soc/pxa/mioa701_wm9713.c index 0b8d1ee..0e73a7f 100644
> --- a/sound/soc/pxa/mioa701_wm9713.c
> +++ b/sound/soc/pxa/mioa701_wm9713.c
> @@ -227,18 +227,7 @@ static struct platform_driver mioa701_wm9713_driver =
> { },
>  };
> 
> -static int __init mioa701_asoc_init(void)
> -{
> -	return platform_driver_register(&mioa701_wm9713_driver);
> -}
> -
> -static void __exit mioa701_asoc_exit(void)
> -{
> -	platform_driver_unregister(&mioa701_wm9713_driver);
> -}
> -
> -module_init(mioa701_asoc_init);
> -module_exit(mioa701_asoc_exit);
> +module_platform_driver(mioa701_wm9713_driver);
> 
>  /* Module information */
>  MODULE_AUTHOR("Robert Jarzmik (rjarzmik at free.fr)");
> diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
> index 7edc1fb..f313eca 100644
> --- a/sound/soc/pxa/palm27x.c
> +++ b/sound/soc/pxa/palm27x.c
> @@ -201,18 +201,7 @@ static struct platform_driver palm27x_wm9712_driver =
> { },
>  };
> 
> -static int __init palm27x_asoc_init(void)
> -{
> -	return platform_driver_register(&palm27x_wm9712_driver);
> -}
> -
> -static void __exit palm27x_asoc_exit(void)
> -{
> -	platform_driver_unregister(&palm27x_wm9712_driver);
> -}
> -
> -module_init(palm27x_asoc_init);
> -module_exit(palm27x_asoc_exit);
> +module_platform_driver(palm27x_wm9712_driver);
> 
>  /* Module information */
>  MODULE_AUTHOR("Marek Vasut <marek.vasut at gmail.com>");
> diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
> index 9c9a51e..a57cfbc 100644
> --- a/sound/soc/pxa/pxa-ssp.c
> +++ b/sound/soc/pxa/pxa-ssp.c
> @@ -825,17 +825,7 @@ static struct platform_driver asoc_ssp_driver = {
>  	.remove = __devexit_p(asoc_ssp_remove),
>  };
> 
> -static int __init pxa_ssp_init(void)
> -{
> -	return platform_driver_register(&asoc_ssp_driver);
> -}
> -module_init(pxa_ssp_init);
> -
> -static void __exit pxa_ssp_exit(void)
> -{
> -	platform_driver_unregister(&asoc_ssp_driver);
> -}
> -module_exit(pxa_ssp_exit);
> +module_platform_driver(asoc_ssp_driver);
> 
>  /* Module information */
>  MODULE_AUTHOR("Mark Brown <broonie at opensource.wolfsonmicro.com>");
> diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
> index 3fec2f3..837ff34 100644
> --- a/sound/soc/pxa/pxa2xx-ac97.c
> +++ b/sound/soc/pxa/pxa2xx-ac97.c
> @@ -263,17 +263,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
>  	},
>  };
> 
> -static int __init pxa_ac97_init(void)
> -{
> -	return platform_driver_register(&pxa2xx_ac97_driver);
> -}
> -module_init(pxa_ac97_init);
> -
> -static void __exit pxa_ac97_exit(void)
> -{
> -	platform_driver_unregister(&pxa2xx_ac97_driver);
> -}
> -module_exit(pxa_ac97_exit);
> +module_platform_driver(pxa2xx_ac97_driver);
> 
>  MODULE_AUTHOR("Nicolas Pitre");
>  MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
> diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
> index 600676f..fdd6bed 100644
> --- a/sound/soc/pxa/pxa2xx-pcm.c
> +++ b/sound/soc/pxa/pxa2xx-pcm.c
> @@ -141,17 +141,7 @@ static struct platform_driver pxa_pcm_driver = {
>  	.remove = __devexit_p(pxa2xx_soc_platform_remove),
>  };
> 
> -static int __init snd_pxa_pcm_init(void)
> -{
> -	return platform_driver_register(&pxa_pcm_driver);
> -}
> -module_init(snd_pxa_pcm_init);
> -
> -static void __exit snd_pxa_pcm_exit(void)
> -{
> -	platform_driver_unregister(&pxa_pcm_driver);
> -}
> -module_exit(snd_pxa_pcm_exit);
> +module_platform_driver(pxa_pcm_driver);
> 
>  MODULE_AUTHOR("Nicolas Pitre");
>  MODULE_DESCRIPTION("Intel PXA2xx PCM DMA module");