Use device life-cycle managed register function to simplify probe.
Signed-off-by: Andrew Davis <afd@xxxxxx>
---
drivers/power/reset/msm-poweroff.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c
index bcf04491e7022..c5831c46f69e2 100644
--- a/drivers/power/reset/msm-poweroff.c
+++ b/drivers/power/reset/msm-poweroff.c
@@ -13,35 +13,24 @@
#include <linux/reboot.h>
#include <linux/pm.h>
-static void __iomem *msm_ps_hold;
-static int deassert_pshold(struct notifier_block *nb, unsigned long action,
- void *data)
+static int do_msm_poweroff(struct sys_off_data *data)
{
+ void __iomem *msm_ps_hold = data->cb_data;
+
writel(0, msm_ps_hold);
mdelay(10000);
return NOTIFY_DONE;
}
-static struct notifier_block restart_nb = {
- .notifier_call = deassert_pshold,
- .priority = 128,
-};
-
-static int do_msm_poweroff(struct sys_off_data *data)
-{
- deassert_pshold(&restart_nb, 0, NULL);
-
- return NOTIFY_DONE;
-}
-
static int msm_restart_probe(struct platform_device *pdev)
{
- msm_ps_hold = devm_platform_ioremap_resource(pdev, 0);
+ void __iomem *msm_ps_hold = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(msm_ps_hold))
return PTR_ERR(msm_ps_hold);
- register_restart_handler(&restart_nb);
+ devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_RESTART,
+ 128, do_msm_poweroff, msm_ps_hold);
devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_POWER_OFF,
SYS_OFF_PRIO_DEFAULT, do_msm_poweroff,
--
2.39.2
