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

Groups > linux.kernel > #1391793

[PATCH 7/7] reset: zynq: 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-zynq.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/reset/reset-zynq.c b/drivers/reset/reset-zynq.c
index a7e87bc..138f2f2 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,
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next 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