Register with kernel poweroff handler instead of setting pm_power_off directly. Register with high priority value of 192 to reflect that the driver explicitly wants to override default poweroff handlers. Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> --- arch/x86/platform/olpc/olpc-xo1-pm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c index a9acde7..96fba36 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -15,6 +15,7 @@ #include <linux/cs5535.h> #include <linux/platform_device.h> #include <linux/export.h> +#include <linux/notifier.h> #include <linux/pm.h> #include <linux/mfd/core.h> #include <linux/suspend.h> @@ -92,7 +93,8 @@ asmlinkage __visible int xo1_do_sleep(u8 sleep_state) return 0; } -static void xo1_power_off(void) +static int xo1_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { printk(KERN_INFO "OLPC XO-1 power off sequence...\n"); @@ -108,8 +110,15 @@ static void xo1_power_off(void) /* Write SLP_EN bit to start the machinery */ outl(0x00002000, acpi_base + CS5536_PM1_CNT); + + return NOTIFY_DONE; } +static struct notifier_block xo1_poweroff_nb = { + .notifier_call = xo1_power_off, + .priority = 192, +}; + static int xo1_power_state_valid(suspend_state_t pm_state) { /* suspend-to-RAM only */ @@ -146,8 +155,12 @@ static int xo1_pm_probe(struct platform_device *pdev) /* If we have both addresses, we can override the poweroff hook */ if (pms_base && acpi_base) { + err = register_poweroff_handler(&xo1_poweroff_nb); + if (err) { + dev_err(&pdev->dev, "Failed to register poweroff handler\n"); + return err; + } suspend_set_ops(&xo1_suspend_ops); - pm_power_off = xo1_power_off; printk(KERN_INFO "OLPC XO-1 support registered\n"); } @@ -158,12 +171,13 @@ static int xo1_pm_remove(struct platform_device *pdev) { mfd_cell_disable(pdev); + unregister_poweroff_handler(&xo1_poweroff_nb); + if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = 0; else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) acpi_base = 0; - pm_power_off = NULL; return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html