Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1391794

[PATCH 6/7] reset: socfpga: use devm_reset_controller_register()

Show all headers | View raw

Use devm_reset_controller_register() for the reset controller
registration and drop the .remove callback.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/reset/reset-socfpga.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index cd05a70..12add9b 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)
 	data->rcdev.ops = &socfpga_reset_ops;
 	data->rcdev.of_node = pdev->dev.of_node;
 
-	return reset_controller_register(&data->rcdev);
-}
-
-static int socfpga_reset_remove(struct platform_device *pdev)
-{
-	struct socfpga_reset_data *data = platform_get_drvdata(pdev);
-
-	reset_controller_unregister(&data->rcdev);
-
-	return 0;
+	return devm_reset_controller_register(dev, &data->rcdev);
 }
 
 static const struct of_device_id socfpga_reset_dt_ids[] = {
@@ -153,7 +144,6 @@ static const struct of_device_id socfpga_reset_dt_ids[] = {
 
 static struct platform_driver socfpga_reset_driver = {
 	.probe	= socfpga_reset_probe,
-	.remove	= socfpga_reset_remove,
 	.driver = {
 		.name		= "socfpga-reset",
 		.of_match_table	= socfpga_reset_dt_ids,
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] reset: add managned reset_controller_register() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:40 +0200
  [PATCH 1/7] reset: add devm_reset_controller_register API Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:40 +0200
    Re: [PATCH 1/7] reset: add devm_reset_controller_register API Philipp Zabel <p.zabel@pengutronix.de> - 2016-05-03 12:20 +0200
      Re: [PATCH 1/7] reset: add devm_reset_controller_register API Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-03 12:30 +0200
        Re: [PATCH 1/7] reset: add devm_reset_controller_register API Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-03 13:50 +0200
          Re: [PATCH 1/7] reset: add devm_reset_controller_register API Philipp Zabel <p.zabel@pengutronix.de> - 2016-05-03 16:30 +0200
    Re: [PATCH 1/7] reset: add devm_reset_controller_register API Laxman Dewangan <ldewangan@nvidia.com> - 2016-05-03 12:30 +0200
  [PATCH 5/7] reset: sunxi: use devm_reset_controller_register() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:40 +0200
  [PATCH 4/7] reset: pistachio: use devm_reset_controller_register() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:50 +0200
  [PATCH 7/7] reset: zynq: use devm_reset_controller_register() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:50 +0200
  [PATCH 6/7] reset: socfpga: use devm_reset_controller_register() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-05-01 12:50 +0200

csiph-web