[PATCH 22/44] power/reset: as3722-poweroff: Register with kernel poweroff handler

Guenter Roeck
2014-10-07T05:28:24Z

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: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/power/reset/as3722-poweroff.c | 36 ++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c
index 6849711..7ebaed9 100644
--- a/drivers/power/reset/as3722-poweroff.c
+++ b/drivers/power/reset/as3722-poweroff.c
@@ -17,32 +17,33 @@

#include <linux/mfd/as3722.h>
#include <linux/module.h>
+#include <linux/notifier.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm.h>
#include <linux/slab.h>

struct as3722_poweroff {
struct device *dev;
struct as3722 *as3722;
+ struct notifier_block poweroff_nb;
};

-static struct as3722_poweroff *as3722_pm_poweroff;
-
-static void as3722_pm_power_off(void)
+static int as3722_power_off(struct notifier_block *this, unsigned long unused1,
+ void *unused2)
{
+ struct as3722_poweroff *as3722_poweroff + container_of(this, struct as3722_poweroff, poweroff_nb);
int ret;

- if (!as3722_pm_poweroff) {
- pr_err("AS3722 poweroff is not initialised\n");
- return;
- }
-
- ret = as3722_update_bits(as3722_pm_poweroff->as3722,
+ ret = as3722_update_bits(as3722_poweroff->as3722,
AS3722_RESET_CONTROL_REG, AS3722_POWER_OFF, AS3722_POWER_OFF);
if (ret < 0)
- dev_err(as3722_pm_poweroff->dev,
+ dev_err(as3722_poweroff->dev,
"RESET_CONTROL_REG update failed, %d\n", ret);
+
+ return NOTIFY_DONE;
}

static int as3722_poweroff_probe(struct platform_device *pdev)
@@ -63,18 +64,19 @@ static int as3722_poweroff_probe(struct platform_device *pdev)

as3722_poweroff->as3722 = dev_get_drvdata(pdev->dev.parent);
as3722_poweroff->dev = &pdev->dev;
- as3722_pm_poweroff = as3722_poweroff;
- if (!pm_power_off)
- pm_power_off = as3722_pm_power_off;
+ as3722_poweroff->poweroff_nb.notifier_call = as3722_power_off;
+ as3722_poweroff->poweroff_nb.priority = 64;

- return 0;
+ platform_set_drvdata(pdev, as3722_poweroff);
+
+ return register_poweroff_handler(&as3722_poweroff->poweroff_nb);
}

static int as3722_poweroff_remove(struct platform_device *pdev)
{
- if (pm_power_off = as3722_pm_power_off)
- pm_power_off = NULL;
- as3722_pm_poweroff = NULL;
+ struct as3722_poweroff *as3722_poweroff = platform_get_drvdata(pdev);
+
+ unregister_poweroff_handler(&as3722_poweroff->poweroff_nb);

return 0;
}
--
1.9.1