[PATCH v2 24/45] regulator: pfuze100: Use devm_register_power_handler()

[Dmitry Osipenko <digetx@xxxxxxxxx>]

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

Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
---
 drivers/regulator/pfuze100-regulator.c | 39 ++++++++++----------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c 
b/drivers/regulator/pfuze100-regulator.c
index d60d7d1b7fa2..73d5baf9d3ea 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -10,6 +10,7 @@
 #include <linux/of_device.h>
 #include <linux/regulator/of_regulator.h>
 #include <linux/platform_device.h>
+#include <linux/reboot.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/pfuze100.h>
@@ -76,6 +77,7 @@ struct pfuze_chip {
        struct pfuze_regulator regulator_descs[PFUZE100_MAX_REGULATOR];
        struct regulator_dev *regulators[PFUZE100_MAX_REGULATOR];
        struct pfuze_regulator *pfuze_regulators;
+       struct power_handler power_handler;
 };
 
 static const int pfuze100_swbst[] = {
@@ -569,10 +571,10 @@ static inline struct device_node *match_of_node(int index)
        return pfuze_matches[index].of_node;
 }
 
-static struct pfuze_chip *syspm_pfuze_chip;
-
-static void pfuze_power_off_prepare(void)
+static void pfuze_power_off_prepare(struct power_off_prep_data *data)
 {
+       struct pfuze_chip *syspm_pfuze_chip = data->cb_data;
+
        dev_info(syspm_pfuze_chip->dev, "Configure standby mode for power off");
 
        /* Switch from default mode: APS/APS to APS/Off */
@@ -611,24 +613,24 @@ static void pfuze_power_off_prepare(void)
 
 static int pfuze_power_off_prepare_init(struct pfuze_chip *pfuze_chip)
 {
+       int err;
+
        if (pfuze_chip->chip_id != PFUZE100) {
                dev_warn(pfuze_chip->dev, "Requested pm_power_off_prepare 
handler for not supported chip\n");
                return -ENODEV;
        }
 
-       if (pm_power_off_prepare) {
-               dev_warn(pfuze_chip->dev, "pm_power_off_prepare is already 
registered.\n");
-               return -EBUSY;
-       }
+       pfuze_chip->power_handler.power_off_prepare_cb = 
pfuze_power_off_prepare;
+       pfuze_chip->power_handler.cb_data = pfuze_chip;
 
-       if (syspm_pfuze_chip) {
-               dev_warn(pfuze_chip->dev, "syspm_pfuze_chip is already set.\n");
-               return -EBUSY;
+       err = devm_register_power_handler(pfuze_chip->dev,
+                                         &pfuze_chip->power_handler);
+       if (err) {
+               dev_err(pfuze_chip->dev,
+                       "failed to register power handler: %d\n", err);
+               return err;
        }
 
-       syspm_pfuze_chip = pfuze_chip;
-       pm_power_off_prepare = pfuze_power_off_prepare;
-
        return 0;
 }
 
@@ -837,23 +839,12 @@ static int pfuze100_regulator_probe(struct i2c_client 
*client,
        return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client)
-{
-       if (syspm_pfuze_chip) {
-               syspm_pfuze_chip = NULL;
-               pm_power_off_prepare = NULL;
-       }
-
-       return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
        .driver = {
                .name = "pfuze100-regulator",
                .of_match_table = pfuze_dt_ids,
        },
        .probe = pfuze100_regulator_probe,
-       .remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);
 
-- 
2.33.1