summaryrefslogtreecommitdiffstats
path: root/drivers/reset/reset-zynq.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-05-01 19:37:03 +0900
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-05-30 09:37:47 +0200
commitda1fda2a2398960f7f7eb1ee3fb0e50155fde275 (patch)
treede00c80a51640879a8eab6ec5086c8046ea78bc2 /drivers/reset/reset-zynq.c
parentdc22e08ef71462e56e51e96359105a75097e745c (diff)
downloadlinux-da1fda2a2398960f7f7eb1ee3fb0e50155fde275.tar.bz2
reset: zynq: use devm_reset_controller_register()
Use devm_reset_controller_register() for the reset controller registration and drop the .remove callback. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/reset/reset-zynq.c')
-rw-r--r--drivers/reset/reset-zynq.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/reset/reset-zynq.c b/drivers/reset/reset-zynq.c
index a7e87bc45885..138f2f205662 100644
--- a/drivers/reset/reset-zynq.c
+++ b/drivers/reset/reset-zynq.c
@@ -122,16 +122,7 @@ static int zynq_reset_probe(struct platform_device *pdev)
priv->rcdev.ops = &zynq_reset_ops;
priv->rcdev.of_node = pdev->dev.of_node;
- return reset_controller_register(&priv->rcdev);
-}
-
-static int zynq_reset_remove(struct platform_device *pdev)
-{
- struct zynq_reset_data *priv = platform_get_drvdata(pdev);
-
- reset_controller_unregister(&priv->rcdev);
-
- return 0;
+ return devm_reset_controller_register(&pdev->dev, &priv->rcdev);
}
static const struct of_device_id zynq_reset_dt_ids[] = {
@@ -141,7 +132,6 @@ static const struct of_device_id zynq_reset_dt_ids[] = {
static struct platform_driver zynq_reset_driver = {
.probe = zynq_reset_probe,
- .remove = zynq_reset_remove,
.driver = {
.name = KBUILD_MODNAME,
.of_match_table = zynq_reset_dt_ids,