Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
soc
/
pxa
/
corgi.c
diff --git
a/kernel/sound/soc/pxa/corgi.c
b/kernel/sound/soc/pxa/corgi.c
index
3580d10
..
c97dc13
100644
(file)
--- a/
kernel/sound/soc/pxa/corgi.c
+++ b/
kernel/sound/soc/pxa/corgi.c
@@
-295,28
+295,19
@@
static int corgi_probe(struct platform_device *pdev)
card->dev = &pdev->dev;
card->dev = &pdev->dev;
- ret =
snd_soc_register_card(
card);
+ ret =
devm_snd_soc_register_card(&pdev->dev,
card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
-static int corgi_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 corgi_driver = {
.driver = {
.name = "corgi-audio",
.pm = &snd_soc_pm_ops,
},
.probe = corgi_probe,
static struct platform_driver corgi_driver = {
.driver = {
.name = "corgi-audio",
.pm = &snd_soc_pm_ops,
},
.probe = corgi_probe,
- .remove = corgi_remove,
};
module_platform_driver(corgi_driver);
};
module_platform_driver(corgi_driver);