Register with kernel power-off handler instead of setting pm_power_off directly. Select fallback priority since the code does not really poweroff the system but resets it instead.
Acked-by: Sebastian Reichel <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> --- v5: - Rebase to v3.18-rc3 v4: - Do not use notifiers but internal functions and data structures to manage the list of power-off handlers. Drop unused parameters from callbacks, and make the power-off function type void v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate - Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx v2: - Use define to specify poweroff handler priority - Fix headline and description - Merge with restart handler code now used in same driver - Use dev_warn instead of dev_err drivers/power/reset/msm-poweroff.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 4702efd..822f358 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -23,11 +23,17 @@ #include <linux/pm.h> static void __iomem *msm_ps_hold; -static int do_msm_restart(struct notifier_block *nb, unsigned long action, - void *data) + +static void _do_msm_restart(void) { writel(0, msm_ps_hold); mdelay(10000); +} + +static int do_msm_restart(struct notifier_block *nb, unsigned long action, + void *data) +{ + _do_msm_restart(); return NOTIFY_DONE; } @@ -37,12 +43,17 @@ static struct notifier_block restart_nb = { .priority = 128, }; -static void do_msm_poweroff(void) +static void do_msm_power_off(struct power_off_handler_block *this) { - /* TODO: Add poweroff capability */ - do_msm_restart(&restart_nb, 0, NULL); + /* TODO: Add power-off capability */ + _do_msm_restart(); } +static struct power_off_handler_block power_off_hb = { + .handler = do_msm_power_off, + .priority = POWER_OFF_PRIORITY_FALLBACK, +}; + static int msm_restart_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -55,7 +66,8 @@ static int msm_restart_probe(struct platform_device *pdev) register_restart_handler(&restart_nb); - pm_power_off = do_msm_poweroff; + if (register_power_off_handler(&power_off_hb)) + dev_warn(&pdev->dev, "Failed to register power-off handler\n"); return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
