diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-01 06:37:02 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-05-30 03:37:47 -0400 |
commit | dc22e08ef71462e56e51e96359105a75097e745c (patch) | |
tree | 29bac45558334ead0a1be820b87daccb9ed7a25c | |
parent | 2f38a88c7c9b0bf1407eba3b0e8e74abfdbe446a (diff) |
reset: socfpga: 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>
-rw-r--r-- | drivers/reset/reset-socfpga.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index cd05a7032b17..12add9b0fa49 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c | |||
@@ -134,16 +134,7 @@ static int socfpga_reset_probe(struct platform_device *pdev) | |||
134 | data->rcdev.ops = &socfpga_reset_ops; | 134 | data->rcdev.ops = &socfpga_reset_ops; |
135 | data->rcdev.of_node = pdev->dev.of_node; | 135 | data->rcdev.of_node = pdev->dev.of_node; |
136 | 136 | ||
137 | return reset_controller_register(&data->rcdev); | 137 | return devm_reset_controller_register(dev, &data->rcdev); |
138 | } | ||
139 | |||
140 | static int socfpga_reset_remove(struct platform_device *pdev) | ||
141 | { | ||
142 | struct socfpga_reset_data *data = platform_get_drvdata(pdev); | ||
143 | |||
144 | reset_controller_unregister(&data->rcdev); | ||
145 | |||
146 | return 0; | ||
147 | } | 138 | } |
148 | 139 | ||
149 | static const struct of_device_id socfpga_reset_dt_ids[] = { | 140 | static const struct of_device_id socfpga_reset_dt_ids[] = { |
@@ -153,7 +144,6 @@ static const struct of_device_id socfpga_reset_dt_ids[] = { | |||
153 | 144 | ||
154 | static struct platform_driver socfpga_reset_driver = { | 145 | static struct platform_driver socfpga_reset_driver = { |
155 | .probe = socfpga_reset_probe, | 146 | .probe = socfpga_reset_probe, |
156 | .remove = socfpga_reset_remove, | ||
157 | .driver = { | 147 | .driver = { |
158 | .name = "socfpga-reset", | 148 | .name = "socfpga-reset", |
159 | .of_match_table = socfpga_reset_dt_ids, | 149 | .of_match_table = socfpga_reset_dt_ids, |