projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[cascardo/linux.git]
/
sound
/
soc
/
omap
/
omap-abe-twl6040.c
diff --git
a/sound/soc/omap/omap-abe-twl6040.c
b/sound/soc/omap/omap-abe-twl6040.c
index
f61b3b5
..
89fe95e
100644
(file)
--- a/
sound/soc/omap/omap-abe-twl6040.c
+++ b/
sound/soc/omap/omap-abe-twl6040.c
@@
-305,23
+305,14
@@
static int omap_abe_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv);
snd_soc_card_set_drvdata(card, priv);
- ret =
snd_soc_register_card(
card);
+ ret =
devm_snd_soc_register_card(&pdev->dev,
card);
if (ret)
if (ret)
- dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+ dev_err(&pdev->dev, "
devm_
snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
ret);
return ret;
}
-static int omap_abe_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
-
- return 0;
-}
-
static const struct of_device_id omap_abe_of_match[] = {
{.compatible = "ti,abe-twl6040", },
{ },
static const struct of_device_id omap_abe_of_match[] = {
{.compatible = "ti,abe-twl6040", },
{ },
@@
-335,7
+326,6
@@
static struct platform_driver omap_abe_driver = {
.of_match_table = omap_abe_of_match,
},
.probe = omap_abe_probe,
.of_match_table = omap_abe_of_match,
},
.probe = omap_abe_probe,
- .remove = omap_abe_remove,
};
static int __init omap_abe_init(void)
};
static int __init omap_abe_init(void)