Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a386ca2 authored by Mika Westerberg's avatar Mika Westerberg Committed by Mark Brown
Browse files

ASoC: edb93xx: convert to use snd_soc_register_card() 



Current method for machine driver to register with the ASoC core is to use
snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Reviewed-by: default avatarRyan Mallon <rmallon@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5a0a03c5

sound/soc/ep93xx/edb93xx.c

+33 −27
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 
#include <mach/hardware.h>

#include "ep93xx-pcm.h"



#define edb93xx_has_audio() (machine_is_edb9301() ||	\

			     machine_is_edb9302() ||	\

			     machine_is_edb9302a() ||	\

			     machine_is_edb9307a() ||	\

			     machine_is_edb9315a())



static int edb93xx_hw_params(struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params)

{
@@ -94,49 +88,61 @@ static struct snd_soc_card snd_soc_edb93xx = { 
	.num_links	= 1,

};



static struct platform_device *edb93xx_snd_device;



static int __init edb93xx_init(void)

static int __devinit edb93xx_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &snd_soc_edb93xx;

	int ret;



	if (!edb93xx_has_audio())

		return -ENODEV;



	ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97,

				 EP93XX_SYSCON_I2SCLKDIV_ORIDE |

				 EP93XX_SYSCON_I2SCLKDIV_SPOL);

	if (ret)

		return ret;



	edb93xx_snd_device = platform_device_alloc("soc-audio", -1);

	if (!edb93xx_snd_device) {

		ret = -ENOMEM;

		goto free_i2s;

	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

		ep93xx_i2s_release();

	}



	platform_set_drvdata(edb93xx_snd_device, &snd_soc_edb93xx);

	ret = platform_device_add(edb93xx_snd_device);

	if (ret)

		goto device_put;

	return ret;

}



	return 0;

static int __devexit edb93xx_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



device_put:

	platform_device_put(edb93xx_snd_device);

free_i2s:

	snd_soc_unregister_card(card);

	ep93xx_i2s_release();

	return ret;



	return 0;

}



static struct platform_driver edb93xx_driver = {

	.driver		= {

		.name	= "edb93xx-audio",

		.owner	= THIS_MODULE,

	},

	.probe		= edb93xx_probe,

	.remove		= __devexit_p(edb93xx_remove),

};



static int __init edb93xx_init(void)

{

	return platform_driver_register(&edb93xx_driver);

}

module_init(edb93xx_init);



static void __exit edb93xx_exit(void)

{

	platform_device_unregister(edb93xx_snd_device);

	ep93xx_i2s_release();

	platform_driver_unregister(&edb93xx_driver);

}

module_exit(edb93xx_exit);



MODULE_AUTHOR("Alexander Sverdlin <subaparts@yandex.ru>");

MODULE_DESCRIPTION("ALSA SoC EDB93xx");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:edb93xx-audio");