mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 03:10:12 +00:00
Code Issues Releases Wiki Activity

ASoC: Convert kirkwood-t5325 to use snd_soc_register_card()

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

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-28 20:30:15 +08:00 committed by Mark Brown
parent dc9c745437
commit 49915a54f0
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-kirkwood/t5325-setup.c
View file

@ -106,6 +106,11 @@ static struct platform_device hp_t5325_button_device = {
}
};
static struct platform_device hp_t5325_audio_device = {
.name = "t5325-audio",
.id = -1,
};
static unsigned int hp_t5325_mpp_config[] __initdata = {
MPP0_NF_IO2,
MPP1_SPI_MOSI,
@ -179,6 +184,7 @@ static void __init hp_t5325_init(void)
kirkwood_sata_init(&hp_t5325_sata_data);
kirkwood_ehci_init();
platform_device_register(&hp_t5325_button_device);
platform_device_register(&hp_t5325_audio_device);
i2c_register_board_info(0, i2c_board_info, ARRAY_SIZE(i2c_board_info));
kirkwood_audio_init();

47
sound/soc/kirkwood/kirkwood-t5325.c
View file

@ -80,7 +80,6 @@ static struct snd_soc_dai_link t5325_dai[] = {
},
};
static struct snd_soc_card t5325 = {
.name = "t5325",
.owner = THIS_MODULE,
@ -93,38 +92,40 @@ static struct snd_soc_card t5325 = {
.num_dapm_routes = ARRAY_SIZE(t5325_route),
};
static struct platform_device *t5325_snd_device;
static int __init t5325_init(void)
static int __devinit t5325_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &t5325;
int ret;
if (!machine_is_t5325())
return 0;
t5325_snd_device = platform_device_alloc("soc-audio", -1);
if (!t5325_snd_device)
return -ENOMEM;
platform_set_drvdata(t5325_snd_device,
&t5325);
ret = platform_device_add(t5325_snd_device);
if (ret) {
printk(KERN_ERR "%s: platform_device_add failed\n", __func__);
platform_device_put(t5325_snd_device);
}
card->dev = &pdev->dev;
ret = snd_soc_register_card(card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
module_init(t5325_init);
static void __exit t5325_exit(void)
static int __devexit t5325_remove(struct platform_device *pdev)
{
platform_device_unregister(t5325_snd_device);
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
return 0;
}
module_exit(t5325_exit);
static struct platform_driver t5325_driver = {
.driver = {
.name = "t5325-audio",
.owner = THIS_MODULE,
},
.probe = t5325_probe,
.remove = __devexit_p(t5325_remove),
};
module_platform_driver(t5325_driver);
MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
MODULE_DESCRIPTION("ALSA SoC t5325 audio client");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:t5325-audio");