[Xen-devel] [PATCH 16/44] mfd: tps6586x: Register with kernel poweroff handler

[Guenter Roeck <linux@xxxxxxxxxxxx>]

Register with kernel poweroff handler instead of setting pm_power_off
directly. Register with a low priority value of 64 to reflect that
the original code only sets pm_power_off if it was not already set.

Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Cc: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
---
 drivers/mfd/tps6586x.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 8e1dbc4..bc14509 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -21,10 +21,12 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/notifier.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/pm.h>
 #include <linux/regmap.h>
 #include <linux/of.h>
 
@@ -133,6 +135,8 @@ struct tps6586x {
        u32                     irq_en;
        u8                      mask_reg[5];
        struct irq_domain       *irq_domain;
+
+       struct notifier_block   poweroff_nb;
 };
 
 static inline struct tps6586x *dev_to_tps6586x(struct device *dev)
@@ -472,13 +476,18 @@ static const struct regmap_config tps6586x_regmap_config 
= {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static struct device *tps6586x_dev;
-static void tps6586x_power_off(void)
+static int tps6586x_power_off(struct notifier_block *this,
+                             unsigned long unused1, void *unused2)
 {
-       if (tps6586x_clr_bits(tps6586x_dev, TPS6586X_SUPPLYENE, EXITSLREQ_BIT))
-               return;
+       struct tps6586x *tps6586x = container_of(this, struct tps6586x,
+                                                poweroff_nb);
+
+       if (tps6586x_clr_bits(tps6586x->dev, TPS6586X_SUPPLYENE, EXITSLREQ_BIT))
+               return NOTIFY_DONE;
 
-       tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
+       tps6586x_set_bits(tps6586x->dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
+
+       return NOTIFY_DONE;
 }
 
 static void tps6586x_print_version(struct i2c_client *client, int version)
@@ -575,9 +584,13 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
                goto err_add_devs;
        }
 
-       if (pdata->pm_off && !pm_power_off) {
-               tps6586x_dev = &client->dev;
-               pm_power_off = tps6586x_power_off;
+       if (pdata->pm_off) {
+               tps6586x->poweroff_nb.notifier_call = tps6586x_power_off;
+               tps6586x->poweroff_nb.priority = 64;
+               ret = register_poweroff_handler(&tps6586x->poweroff_nb);
+               if (ret)
+                       dev_err(&client->dev,
+                               "failed to register poweroff handler\n");
        }
 
        return 0;
@@ -594,6 +607,8 @@ static int tps6586x_i2c_remove(struct i2c_client *client)
 {
        struct tps6586x *tps6586x = i2c_get_clientdata(client);
 
+       unregister_poweroff_handler(&tps6586x->poweroff_nb);
+
        tps6586x_remove_subdevs(tps6586x);
        mfd_remove_devices(tps6586x->dev);
        if (client->irq)
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel