On Mon, 06 Oct 2014, Guenter Roeck wrote:
> Register with kernel poweroff handler instead of setting pm_power_off
> directly. Register with a low priority value of 64 to reflect that
> the original code only sets pm_power_off if it was not already set.
>
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/mfd/ab8500-sysctrl.c | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
> index 8e0dae5..677438f 100644
> --- a/drivers/mfd/ab8500-sysctrl.c
> +++ b/drivers/mfd/ab8500-sysctrl.c
> @@ -6,6 +6,7 @@
[...]
> +static int ab8500_power_off(struct notifier_block *this, unsigned long unused1,
> + void *unused2)
> {
> sigset_t old;
> sigset_t all;
> @@ -34,11 +36,6 @@ static void ab8500_power_off(void)
> struct power_supply *psy;
> int ret;
>
> - if (sysctrl_dev == NULL) {
> - pr_err("%s: sysctrl not initialized\n", __func__);
> - return;
> - }
Can you explain the purpose of this change please?
> /*
> * If we have a charger connected and we're powering off,
> * reboot into charge-only mode.
> @@ -83,8 +80,15 @@ shutdown:
> AB8500_STW4500CTRL1_SWRESET4500N);
> (void)sigprocmask(SIG_SETMASK, &old, NULL);
> }
> +
> + return NOTIFY_DONE;
> }
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
