Commit 8eb776ab authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown

ASoC: Intel: Use devm_snd_soc_register_card

Simplify byt-rt5640.c and haswell.c machine drivers by using
devm_snd_soc_register_card(). Remove also needless dev_set_drvdata()
from byt_rt5640_probe() since snd_soc_register_card() does it too.
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a018c285
...@@ -152,25 +152,13 @@ static const struct dev_pm_ops byt_rt5640_pm_ops = { ...@@ -152,25 +152,13 @@ static const struct dev_pm_ops byt_rt5640_pm_ops = {
static int byt_rt5640_probe(struct platform_device *pdev) static int byt_rt5640_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &byt_rt5640_card; struct snd_soc_card *card = &byt_rt5640_card;
struct device *dev = &pdev->dev;
card->dev = &pdev->dev; card->dev = &pdev->dev;
dev_set_drvdata(dev, card); return devm_snd_soc_register_card(&pdev->dev, card);
return snd_soc_register_card(card);
}
static int byt_rt5640_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
return 0;
} }
static struct platform_driver byt_rt5640_audio = { static struct platform_driver byt_rt5640_audio = {
.probe = byt_rt5640_probe, .probe = byt_rt5640_probe,
.remove = byt_rt5640_remove,
.driver = { .driver = {
.name = "byt-rt5640", .name = "byt-rt5640",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -208,18 +208,11 @@ static int haswell_audio_probe(struct platform_device *pdev) ...@@ -208,18 +208,11 @@ static int haswell_audio_probe(struct platform_device *pdev)
{ {
haswell_rt5640.dev = &pdev->dev; haswell_rt5640.dev = &pdev->dev;
return snd_soc_register_card(&haswell_rt5640); return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640);
}
static int haswell_audio_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&haswell_rt5640);
return 0;
} }
static struct platform_driver haswell_audio = { static struct platform_driver haswell_audio = {
.probe = haswell_audio_probe, .probe = haswell_audio_probe,
.remove = haswell_audio_remove,
.driver = { .driver = {
.name = "haswell-audio", .name = "haswell-audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment