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

Commit 2445ecc3 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: pxa: Convert poodle to use snd_soc_register_card() 



Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1b39bf34

arch/arm/mach-pxa/poodle.c

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = { 
EXPORT_SYMBOL(poodle_scoop_device);





static struct platform_device poodle_audio_device = {

	.name	= "poodle-audio",

	.id	= -1,

};



/* LoCoMo device */

static struct resource locomo_resources[] = {

	[0] = {
@@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = { 
static struct platform_device *devices[] __initdata = {

	&poodle_locomo_device,

	&poodle_scoop_device,

	&poodle_audio_device,

	&sharpsl_nand_device,

	&sharpsl_rom_device,

};

sound/soc/pxa/poodle.c

+23 −19
Original line number Diff line number Diff line
@@ -281,22 +281,18 @@ static struct snd_soc_dai_link poodle_dai = { 
};



/* poodle audio machine driver */

static struct snd_soc_card snd_soc_poodle = {

static struct snd_soc_card poodle = {

	.name = "Poodle",

	.dai_link = &poodle_dai,

	.num_links = 1,

	.owner = THIS_MODULE,

};



static struct platform_device *poodle_snd_device;



static int __init poodle_init(void)

static int __devinit poodle_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &poodle;

	int ret;



	if (!machine_is_poodle())

		return -ENODEV;



	locomo_gpio_set_dir(&poodle_locomo_device.dev,

		POODLE_LOCOMO_GPIO_AMP_ON, 0);

	/* should we mute HP at startup - burning power ?*/
@@ -305,28 +301,36 @@ static int __init poodle_init(void) 
	locomo_gpio_set_dir(&poodle_locomo_device.dev,

		POODLE_LOCOMO_GPIO_MUTE_R, 0);



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

	if (!poodle_snd_device)

		return -ENOMEM;



	platform_set_drvdata(poodle_snd_device, &snd_soc_poodle);

	ret = platform_device_add(poodle_snd_device);

	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	if (ret)

		platform_device_put(poodle_snd_device);



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

			ret);

	return ret;

}



static void __exit poodle_exit(void)

static int __devexit poodle_remove(struct platform_device *pdev)

{

	platform_device_unregister(poodle_snd_device);

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



module_init(poodle_init);

module_exit(poodle_exit);

static struct platform_driver poodle_driver = {

	.driver		= {

		.name	= "poodle-audio",

		.owner	= THIS_MODULE,

	},

	.probe		= poodle_probe,

	.remove		= __devexit_p(poodle_remove),

};



module_platform_driver(poodle_driver);



/* Module information */

MODULE_AUTHOR("Richard Purdie");

MODULE_DESCRIPTION("ALSA SoC Poodle");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:poodle-audio");