lkml.org 
[lkml]   [2014]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [alsa-devel] [PATCH 1/5] ASoC: omap: rx51: Use devm_snd_soc_register_card
On 4/6/2014 3:05 AM, Sebastian Reichel wrote:
> From: Pali Rohár <pali.rohar@gmail.com>
>
> This patch converts the rx51 ASoC module to use
> devm_snd_soc_register_card. It also adds module alias
> to support driver autoloading.
>
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> ---
> sound/soc/omap/rx51.c | 48 ++++++++++++++++++++++++++++--------------------
> 1 file changed, 28 insertions(+), 20 deletions(-)
>
> diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
> index 7fb3d4b..58f5e12 100644
> --- a/sound/soc/omap/rx51.c
> +++ b/sound/soc/omap/rx51.c
> @@ -394,10 +394,9 @@ static struct snd_soc_card rx51_sound_card = {
> .num_configs = ARRAY_SIZE(rx51_codec_conf),
> };
>
> -static struct platform_device *rx51_snd_device;
> -
> -static int __init rx51_soc_init(void)
> +static int rx51_soc_probe(struct platform_device *pdev)
> {
> + struct snd_soc_card *card = &rx51_sound_card;
> int err;
>
> if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
> @@ -412,22 +411,17 @@ static int __init rx51_soc_init(void)
> if (err)
> goto err_gpio_eci_sw;
>
> - rx51_snd_device = platform_device_alloc("soc-audio", -1);
> - if (!rx51_snd_device) {
> - err = -ENOMEM;
> - goto err1;
> - }
> -
> - platform_set_drvdata(rx51_snd_device, &rx51_sound_card);
> + card->dev = &pdev->dev;
>
> - err = platform_device_add(rx51_snd_device);
> - if (err)
> - goto err2;
> + err = devm_snd_soc_register_card(card->dev, card);
> + if (err) {
> + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", err);
> + goto err_snd;
> + }
>
> return 0;
> -err2:
> - platform_device_put(rx51_snd_device);
> -err1:
> +err_snd:
> + card->dev = NULL;

Why this is required???

~Rajeev

> gpio_free(RX51_ECI_SW_GPIO);
> err_gpio_eci_sw:
> gpio_free(RX51_TVOUT_SEL_GPIO);
> @@ -436,19 +430,33 @@ err_gpio_tvout_sel:
> return err;
> }
>
> -static void __exit rx51_soc_exit(void)
> +static int rx51_soc_remove(struct platform_device *pdev)
> {
> + struct snd_soc_card *card = platform_get_drvdata(pdev);
> +
> snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
> rx51_av_jack_gpios);
>
> - platform_device_unregister(rx51_snd_device);
> + card->dev = NULL;
> +
> gpio_free(RX51_ECI_SW_GPIO);
> gpio_free(RX51_TVOUT_SEL_GPIO);
> +
> + return 0;
> }
>
> -module_init(rx51_soc_init);
> -module_exit(rx51_soc_exit);
> +static struct platform_driver rx51_soc_driver = {
> + .driver = {
> + .name = "rx51-audio",
> + .owner = THIS_MODULE,
> + },
> + .probe = rx51_soc_probe,
> + .remove = rx51_soc_remove,
> +};
> +
> +module_platform_driver(rx51_soc_driver);
>
> MODULE_AUTHOR("Nokia Corporation");
> MODULE_DESCRIPTION("ALSA SoC Nokia RX-51");
> MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:rx51-audio");
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2014-04-15 16:21    [W:0.084 / U:3.776 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site