mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
ASoC: au1x: Convert to devm_snd_soc_register_card
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
6ff33f3902
commit
2342cafe22
@ -38,14 +38,7 @@ static int db1000_audio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = &db1000_ac97;
|
||||
card->dev = &pdev->dev;
|
||||
return snd_soc_register_card(card);
|
||||
}
|
||||
|
||||
static int db1000_audio_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
snd_soc_unregister_card(card);
|
||||
return 0;
|
||||
return devm_snd_soc_register_card(&pdev->dev, card);
|
||||
}
|
||||
|
||||
static struct platform_driver db1000_audio_driver = {
|
||||
@ -54,7 +47,6 @@ static struct platform_driver db1000_audio_driver = {
|
||||
.pm = &snd_soc_pm_ops,
|
||||
},
|
||||
.probe = db1000_audio_probe,
|
||||
.remove = db1000_audio_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(db1000_audio_driver);
|
||||
|
@ -174,14 +174,7 @@ static int db1200_audio_probe(struct platform_device *pdev)
|
||||
|
||||
card = db1200_cards[pid->driver_data];
|
||||
card->dev = &pdev->dev;
|
||||
return snd_soc_register_card(card);
|
||||
}
|
||||
|
||||
static int db1200_audio_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
snd_soc_unregister_card(card);
|
||||
return 0;
|
||||
return devm_snd_soc_register_card(&pdev->dev, card);
|
||||
}
|
||||
|
||||
static struct platform_driver db1200_audio_driver = {
|
||||
@ -191,7 +184,6 @@ static struct platform_driver db1200_audio_driver = {
|
||||
},
|
||||
.id_table = db1200_pids,
|
||||
.probe = db1200_audio_probe,
|
||||
.remove = db1200_audio_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(db1200_audio_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user