From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH v3 15/47] mfd: dm355evm_msp: Register with kernel power-off handler Date: Mon, 27 Oct 2014 08:55:22 -0700 Message-ID: <1414425354-10359-16-git-send-email-linux@roeck-us.net> References: <1414425354-10359-1-git-send-email-linux@roeck-us.net> Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:50055 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752733AbaJ0P4m (ORCPT ); Mon, 27 Oct 2014 11:56:42 -0400 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Ximev-000byy-RP for linux-pm@vger.kernel.org; Mon, 27 Oct 2014 15:56:41 +0000 In-Reply-To: <1414425354-10359-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Samuel Ortiz , Lee Jones Register with kernel power-off 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. Cc: Samuel Ortiz Cc: Lee Jones Signed-off-by: Guenter Roeck --- v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate - Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx v2: - Use define to specify poweroff handler priority - Use dev_warn instead of dev_err drivers/mfd/dm355evm_msp.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c index 4c826f7..63a1632 100644 --- a/drivers/mfd/dm355evm_msp.c +++ b/drivers/mfd/dm355evm_msp.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include #include @@ -352,14 +354,22 @@ static void dm355evm_command(unsigned command) command, status); } -static void dm355evm_power_off(void) +static int dm355evm_power_off(struct notifier_block *this, + unsigned long unused1, void *unused2) { dm355evm_command(MSP_COMMAND_POWEROFF); + + return NOTIFY_DONE; } +static struct notifier_block dm355evm_msp_power_off_nb = { + .notifier_call = dm355evm_power_off, + .priority = POWER_OFF_PRIORITY_LOW, +}; + static int dm355evm_msp_remove(struct i2c_client *client) { - pm_power_off = NULL; + unregister_power_off_handler(&dm355evm_msp_power_off_nb); msp430 = NULL; return 0; } @@ -398,7 +408,9 @@ dm355evm_msp_probe(struct i2c_client *client, const struct i2c_device_id *id) goto fail; /* PM hookup */ - pm_power_off = dm355evm_power_off; + status = register_power_off_handler(&dm355evm_msp_power_off_nb); + if (status) + dev_warn(&client->dev, "Failed to register power-off handler\n"); return 0; -- 1.9.1