reset: ath79: use devm_reset_controller_register()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Sun, 1 May 2016 10:36:58 +0000 (19:36 +0900)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 30 May 2016 07:37:47 +0000 (09:37 +0200)
Use devm_reset_controller_register() for the reset controller
registration and remove the unregister call from the .remove callback.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
drivers/reset/reset-ath79.c

index ccb940a8d9fb4f287d8303c17efbecc218c6f91c..16d410cd6146c24ee759e914dd7ac0afb75a74a3 100644 (file)
@@ -112,7 +112,7 @@ static int ath79_reset_probe(struct platform_device *pdev)
        ath79_reset->rcdev.of_reset_n_cells = 1;
        ath79_reset->rcdev.nr_resets = 32;
 
-       err = reset_controller_register(&ath79_reset->rcdev);
+       err = devm_reset_controller_register(&pdev->dev, &ath79_reset->rcdev);
        if (err)
                return err;
 
@@ -131,7 +131,6 @@ static int ath79_reset_remove(struct platform_device *pdev)
        struct ath79_reset *ath79_reset = platform_get_drvdata(pdev);
 
        unregister_restart_handler(&ath79_reset->restart_nb);
-       reset_controller_unregister(&ath79_reset->rcdev);
 
        return 0;
 }