Register with kernel poweroff handler instead of setting pm_power_off directly. Select default priority to reflect that the original code sets pm_power_off unconditionally.
Signed-off-by: Guenter Roeck <li...@roeck-us.net> --- v2: Added patch drivers/power/reset/at91-poweroff.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index c610003..ac49a83 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -12,8 +12,10 @@ #include <linux/io.h> #include <linux/module.h> +#include <linux/notifier.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pm.h> #include <linux/printk.h> #define AT91_SHDW_CR 0x00 /* Shut Down Control Register */ @@ -66,11 +68,19 @@ static void __init at91_wakeup_status(void) pr_info("AT91: Wake-Up source: %s\n", reason); } -static void at91_poweroff(void) +static int at91_poweroff(struct notifier_block *this, unsigned long unused1, + void *unused2) { writel(AT91_SHDW_KEY | AT91_SHDW_SHDW, at91_shdwc_base + AT91_SHDW_CR); + + return NOTIFY_DONE; } +static struct notifier_block at91_poweroff_nb = { + .notifier_call = at91_poweroff, + .priority = POWEROFF_PRIORITY_DEFAULT, +}; + const enum wakeup_type at91_poweroff_get_wakeup_mode(struct device_node *np) { const char *pm; @@ -134,9 +144,7 @@ static int at91_poweroff_probe(struct platform_device *pdev) if (pdev->dev.of_node) at91_poweroff_dt_set_wakeup_mode(pdev); - pm_power_off = at91_poweroff; - - return 0; + return devm_register_power_off_handler(&pdev->dev, &at91_poweroff_nb); } static struct of_device_id at91_poweroff_of_match[] = { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/