| Message ID | 1413864783-3271-13-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 21, 2014 at 6:12 AM, Guenter Roeck <linux@roeck-us.net> wrote: > Register with kernel poweroff handler instead of setting pm_power_off > directly. Register with low priority to reflect that the original code > only sets pm_power_off if it was not already set. > > sysctrl_dev is set prior to poweroff handler registration, and the > poweroff handler is unregistered prior to clearing sysrctrl_dev. > It is therefore not necessary to check if sysctrl_dev is NULL in the > poweroff handler, and the check was removed. Setting sysctrl_dev to NULL > in the remove function was also removed as unnecessary. With those changes, > devm_register_power_off_handler can be used to register the poeroff handler. > The now empty remove function was retained since the ab8500_restart function, > which is currently unused, would likely need some cleanup if it was ever used. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > v2: > - Use define to specify poweroff handler priority > - Use devm_register_power_off_handler > - Use dev_warn instead of dev_err > - Since we use devm_register_power_off_handler, > we need to check if sysctrl_dev in the poweroff handler to avoid > a race condition on unload, so this check is no longer removed I can't compile this, I guess because of a dependency on some other patch? CC drivers/mfd/ab8500-sysctrl.o ../drivers/mfd/ab8500-sysctrl.c:94:14: error: ‘POWEROFF_PRIORITY_LOW’ undeclared here (not in a function) .priority = POWEROFF_PRIORITY_LOW, ^ ../drivers/mfd/ab8500-sysctrl.c: In function ‘ab8500_sysctrl_probe’: ../drivers/mfd/ab8500-sysctrl.c:206:2: error: implicit declaration of function ‘devm_register_power_off_handler’ [-Werror=implicit-function-declaration] err = devm_register_power_off_handler(sysctrl_dev, &ab8500_poweroff_nb); I wanted to provide a Tested-by but I guess I can only give this: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Mon, Oct 27, 2014 at 04:59:00PM +0100, Linus Walleij wrote: > On Tue, Oct 21, 2014 at 6:12 AM, Guenter Roeck <linux@roeck-us.net> wrote: > > > Register with kernel poweroff handler instead of setting pm_power_off > > directly. Register with low priority to reflect that the original code > > only sets pm_power_off if it was not already set. > > > > sysctrl_dev is set prior to poweroff handler registration, and the > > poweroff handler is unregistered prior to clearing sysrctrl_dev. > > It is therefore not necessary to check if sysctrl_dev is NULL in the > > poweroff handler, and the check was removed. Setting sysctrl_dev to NULL > > in the remove function was also removed as unnecessary. With those changes, > > devm_register_power_off_handler can be used to register the poeroff handler. > > The now empty remove function was retained since the ab8500_restart function, > > which is currently unused, would likely need some cleanup if it was ever used. > > > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: Lee Jones <lee.jones@linaro.org> > > Cc: Samuel Ortiz <sameo@linux.intel.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- > > v2: > > - Use define to specify poweroff handler priority > > - Use devm_register_power_off_handler > > - Use dev_warn instead of dev_err > > - Since we use devm_register_power_off_handler, > > we need to check if sysctrl_dev in the poweroff handler to avoid > > a race condition on unload, so this check is no longer removed > > I can't compile this, I guess because of a dependency on some > other patch? > Hi Linus, can you try v3 ? It has a number of improvements, and POWEROFF_PRIORITY_LOW was replaced with POWER_OFF_PRIORITY_LOW. You will need patch 01/47 of the series as well to get the definition. > CC drivers/mfd/ab8500-sysctrl.o > ../drivers/mfd/ab8500-sysctrl.c:94:14: error: ‘POWEROFF_PRIORITY_LOW’ > undeclared here (not in a function) > .priority = POWEROFF_PRIORITY_LOW, > ^ > ../drivers/mfd/ab8500-sysctrl.c: In function ‘ab8500_sysctrl_probe’: > ../drivers/mfd/ab8500-sysctrl.c:206:2: error: implicit declaration of > function ‘devm_register_power_off_handler’ > [-Werror=implicit-function-declaration] > err = devm_register_power_off_handler(sysctrl_dev, &ab8500_poweroff_nb); > > I wanted to provide a Tested-by but I guess I can only give this: > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Thanks! Guenter
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 8e0dae5..dc634d5 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -6,6 +6,7 @@ #include <linux/err.h> #include <linux/module.h> +#include <linux/notifier.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/reboot.h> @@ -23,7 +24,8 @@ static struct device *sysctrl_dev; -static void ab8500_power_off(void) +static int ab8500_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { sigset_t old; sigset_t all; @@ -36,7 +38,7 @@ static void ab8500_power_off(void) if (sysctrl_dev == NULL) { pr_err("%s: sysctrl not initialized\n", __func__); - return; + return NOTIFY_DONE; } /* @@ -83,8 +85,15 @@ shutdown: AB8500_STW4500CTRL1_SWRESET4500N); (void)sigprocmask(SIG_SETMASK, &old, NULL); } + + return NOTIFY_DONE; } +static struct notifier_block ab8500_poweroff_nb = { + .notifier_call = ab8500_power_off, + .priority = POWEROFF_PRIORITY_LOW, +}; + /* * Use the AB WD to reset the platform. It will perform a hard * reset instead of a soft reset. Write the reset reason to @@ -185,6 +194,7 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); struct ab8500_platform_data *plat; struct ab8500_sysctrl_platform_data *pdata; + int err; plat = dev_get_platdata(pdev->dev.parent); @@ -193,8 +203,9 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) sysctrl_dev = &pdev->dev; - if (!pm_power_off) - pm_power_off = ab8500_power_off; + err = devm_register_power_off_handler(sysctrl_dev, &ab8500_poweroff_nb); + if (err) + dev_warn(&pdev->dev, "Failed to register poweroff handler\n"); pdata = plat->sysctrl; if (pdata) { @@ -228,9 +239,6 @@ static int ab8500_sysctrl_remove(struct platform_device *pdev) { sysctrl_dev = NULL; - if (pm_power_off == ab8500_power_off) - pm_power_off = NULL; - return 0; }
Register with kernel poweroff handler instead of setting pm_power_off directly. Register with low priority to reflect that the original code only sets pm_power_off if it was not already set. sysctrl_dev is set prior to poweroff handler registration, and the poweroff handler is unregistered prior to clearing sysrctrl_dev. It is therefore not necessary to check if sysctrl_dev is NULL in the poweroff handler, and the check was removed. Setting sysctrl_dev to NULL in the remove function was also removed as unnecessary. With those changes, devm_register_power_off_handler can be used to register the poeroff handler. The now empty remove function was retained since the ab8500_restart function, which is currently unused, would likely need some cleanup if it was ever used. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lee Jones <lee.jones@linaro.org> Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v2: - Use define to specify poweroff handler priority - Use devm_register_power_off_handler - Use dev_warn instead of dev_err - Since we use devm_register_power_off_handler, we need to check if sysctrl_dev in the poweroff handler to avoid a race condition on unload, so this check is no longer removed drivers/mfd/ab8500-sysctrl.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)