Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56865f45 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Philipp Zabel
Browse files

reset: ath79: use devm_reset_controller_register() 



Use devm_reset_controller_register() for the reset controller
registration and remove the unregister call from the .remove callback.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 8d5b5d5c

drivers/reset/reset-ath79.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static int ath79_reset_probe(struct platform_device *pdev) 
	ath79_reset->rcdev.of_reset_n_cells = 1;

	ath79_reset->rcdev.of_reset_n_cells = 1;

	ath79_reset->rcdev.nr_resets = 32;

	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)

	if (err)

		return 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);

	struct ath79_reset *ath79_reset = platform_get_drvdata(pdev);





	unregister_restart_handler(&ath79_reset->restart_nb);

	unregister_restart_handler(&ath79_reset->restart_nb);

	reset_controller_unregister(&ath79_reset->rcdev);





	return 0;

	return 0;

}

}