[PATCH v2 39/45] mfd: dm355evm_msp: Use devm_register_trivial_power_off_handler()

[Dmitry Osipenko <digetx@xxxxxxxxx>]

Use devm_register_trivial_power_off_handler() that replaces global
pm_power_off variable and allows to register multiple power-off handlers.

Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
---
 drivers/mfd/dm355evm_msp.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 54fb6cbd2aa0..5ee830f65589 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -8,6 +8,7 @@
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
+#include <linux/reboot.h>
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -375,11 +376,10 @@ static void dm355evm_power_off(void)
        dm355evm_command(MSP_COMMAND_POWEROFF);
 }
 
-static int dm355evm_msp_remove(struct i2c_client *client)
+static void dm355evm_msp_remove(void *data)
 {
-       pm_power_off = NULL;
+       /* FIXME remove children ... */
        msp430 = NULL;
-       return 0;
 }
 
 static int
@@ -392,6 +392,11 @@ dm355evm_msp_probe(struct i2c_client *client, const struct 
i2c_device_id *id)
                return -EBUSY;
        msp430 = client;
 
+       status = devm_add_action_or_reset(&client->dev, dm355evm_msp_remove,
+                                         NULL);
+       if (status < 0)
+               goto fail;
+
        /* display revision status; doubles as sanity check */
        status = dm355evm_msp_read(DM355EVM_MSP_FIRMREV);
        if (status < 0)
@@ -416,13 +421,15 @@ dm355evm_msp_probe(struct i2c_client *client, const 
struct i2c_device_id *id)
                goto fail;
 
        /* PM hookup */
-       pm_power_off = dm355evm_power_off;
+       status = devm_register_trivial_power_off_handler(&client->dev,
+                                                        dm355evm_power_off);
+       if (status)
+               dev_err(&client->dev, "failed to register power-off handler: 
%d",
+                       status);
 
        return 0;
 
 fail:
-       /* FIXME remove children ... */
-       dm355evm_msp_remove(client);
        return status;
 }
 
@@ -436,7 +443,6 @@ static struct i2c_driver dm355evm_msp_driver = {
        .driver.name    = "dm355evm_msp",
        .id_table       = dm355evm_msp_ids,
        .probe          = dm355evm_msp_probe,
-       .remove         = dm355evm_msp_remove,
 };
 
 static int __init dm355evm_msp_init(void)
-- 
2.33.1