[PATCH v2 32/45] mfd: retu: 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/retu-mfd.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index c748fd29a220..d18f05c1f095 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
+#include <linux/reboot.h>
 #include <linux/regmap.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/retu.h>
@@ -81,9 +82,6 @@ static struct regmap_irq_chip retu_irq_chip = {
        .ack_base       = RETU_REG_IDR,
 };
 
-/* Retu device registered for the power off. */
-static struct retu_dev *retu_pm_power_off;
-
 static const struct resource tahvo_usb_res[] = {
        {
                .name   = "tahvo-usb",
@@ -165,12 +163,12 @@ int retu_write(struct retu_dev *rdev, u8 reg, u16 data)
 }
 EXPORT_SYMBOL_GPL(retu_write);
 
-static void retu_power_off(void)
+static void retu_power_off(void *data)
 {
-       struct retu_dev *rdev = retu_pm_power_off;
+       struct retu_dev *rdev = data;
        int reg;
 
-       mutex_lock(&retu_pm_power_off->mutex);
+       mutex_lock(&rdev->mutex);
 
        /* Ignore power button state */
        regmap_read(rdev->regmap, RETU_REG_CC1, &reg);
@@ -183,7 +181,7 @@ static void retu_power_off(void)
        for (;;)
                cpu_relax();
 
-       mutex_unlock(&retu_pm_power_off->mutex);
+       mutex_unlock(&rdev->mutex);
 }
 
 static int retu_regmap_read(void *context, const void *reg, size_t reg_size,
@@ -261,6 +259,17 @@ static int retu_probe(struct i2c_client *i2c, const struct 
i2c_device_id *id)
                 (ret & RETU_REG_ASICR_VILMA) ? rdat->companion_name : "",
                 (ret >> 4) & 0x7, ret & 0xf);
 
+       if (i2c->addr == 1) {
+               ret = devm_register_simple_power_off_handler(&i2c->dev,
+                                                            retu_power_off,
+                                                            rdev);
+               if (ret) {
+                       dev_err(rdev->dev,
+                               "could not register power-off handler: %d\n", 
ret);
+                       return ret;
+               }
+       }
+
        /* Mask all interrupts. */
        ret = retu_write(rdev, rdat->irq_chip->mask_base, 0xffff);
        if (ret < 0)
@@ -279,10 +288,6 @@ static int retu_probe(struct i2c_client *i2c, const struct 
i2c_device_id *id)
                return ret;
        }
 
-       if (i2c->addr == 1 && !pm_power_off) {
-               retu_pm_power_off = rdev;
-               pm_power_off      = retu_power_off;
-       }
 
        return 0;
 }
@@ -291,10 +296,6 @@ static int retu_remove(struct i2c_client *i2c)
 {
        struct retu_dev *rdev = i2c_get_clientdata(i2c);
 
-       if (retu_pm_power_off == rdev) {
-               pm_power_off      = NULL;
-               retu_pm_power_off = NULL;
-       }
        mfd_remove_devices(rdev->dev);
        regmap_del_irq_chip(i2c->irq, rdev->irq_data);
 
-- 
2.33.1