Register with kernel poweroff handler instead of setting pm_power_off directly. Select proprity 0 since the code does not really poweroff the system. Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> --- drivers/power/reset/msm-poweroff.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 774f9a3..189bcd3 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -19,6 +19,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/module.h> +#include <linux/notifier.h> #include <linux/reboot.h> #include <asm/system_misc.h> @@ -31,12 +32,19 @@ static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd) mdelay(10000); } -static void do_msm_poweroff(void) +static int do_msm_poweroff(struct notifier_block *this, + unsigned long unused1, void *unused2) { /* TODO: Add poweroff capability */ do_msm_restart(REBOOT_HARD, NULL); + + return NOTIFY_DONE; } +static struct notifier_block msm_powroff_nb = { + .notifier_call = do_msm_poweroff, +}; + static int msm_restart_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -47,7 +55,8 @@ static int msm_restart_probe(struct platform_device *pdev) if (IS_ERR(msm_ps_hold)) return PTR_ERR(msm_ps_hold); - pm_power_off = do_msm_poweroff; + if (register_poweroff_handler(&msm_powroff_nb)) + dev_err(&pdev->dev, "Failed to register poweroff handler\n"); arm_pm_restart = do_msm_restart; return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html