[PATCH v2 33/45] mfd: rk808: Use devm_register_simple_power_off_handler()

[Dmitry Osipenko <digetx@xxxxxxxxx>]

Use devm_register_simple_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/rk808.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index b181fe401330..3bf369469053 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -18,6 +18,7 @@
 #include <linux/mfd/core.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/reboot.h>
 #include <linux/regmap.h>
 
 struct rk808_reg_data {
@@ -526,12 +527,11 @@ static const struct regmap_irq_chip rk818_irq_chip = {
        .init_ack_masked = true,
 };
 
-static struct i2c_client *rk808_i2c_client;
-
-static void rk808_pm_power_off(void)
+static void rk808_pm_power_off(void *data)
 {
        int ret;
        unsigned int reg, bit;
+       struct i2c_client *rk808_i2c_client = data;
        struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
 
        switch (rk808->variant) {
@@ -725,8 +725,14 @@ static int rk808_probe(struct i2c_client *client,
        }
 
        if (of_property_read_bool(np, "rockchip,system-power-controller")) {
-               rk808_i2c_client = client;
-               pm_power_off = rk808_pm_power_off;
+               ret = devm_register_simple_power_off_handler(&client->dev,
+                                                            rk808_pm_power_off,
+                                                            client);
+               if (ret) {
+                       dev_err(&client->dev,
+                               "failed to register power-off handler %d\n", 
ret);
+                       goto err_irq;
+               }
        }
 
        return 0;
@@ -742,13 +748,6 @@ static int rk808_remove(struct i2c_client *client)
 
        regmap_del_irq_chip(client->irq, rk808->irq_data);
 
-       /**
-        * pm_power_off may points to a function from another module.
-        * Check if the pointer is set by us and only then overwrite it.
-        */
-       if (pm_power_off == rk808_pm_power_off)
-               pm_power_off = NULL;
-
        return 0;
 }
 
-- 
2.33.1