[PATCH v5 10/48] mfd: axp20x: Register with kernel power-off handler

Guenter Roeck
2014-11-06T16:44:18Z

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: Lee Jones <lee.jones@linaro.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v5:
- Rebase to v3.18-rc3
v4:
- Do not use notifiers but internal functions and data structures to manage
the list of power-off handlers. Drop unused parameters from callbacks, and
make the power-off function type void
v3:
- Replace poweroff in all newly introduced variables and in text
with power_off or power-off as appropriate
- Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx
v2:
- Use define to specify powroff handler priority
- Use devm_register_power_off_handler
- Use dev_warn instead of dev_err

drivers/mfd/axp20x.c | 24 +++++++++++-------------
include/linux/mfd/axp20x.h | 1 +
2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 6231adb..e2430e6 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -150,11 +150,13 @@ static struct mfd_cell axp20x_cells[] = {
},
};

-static struct axp20x_dev *axp20x_pm_power_off;
-static void axp20x_power_off(void)
+static void axp20x_power_off(struct power_off_handler_block *this)
+
{
- regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
- AXP20X_OFF);
+ struct axp20x_dev *axp20x = container_of(this, struct axp20x_dev,
+ power_off_hb);
+
+ regmap_write(axp20x->regmap, AXP20X_OFF_CTRL, AXP20X_OFF);
}

static int axp20x_i2c_probe(struct i2c_client *i2c,
@@ -204,10 +206,11 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
return ret;
}

- if (!pm_power_off) {
- axp20x_pm_power_off = axp20x;
- pm_power_off = axp20x_power_off;
- }
+ axp20x->power_off_hb.handler = axp20x_power_off;
+ axp20x->power_off_hb.priority = POWER_OFF_PRIORITY_LOW;
+ ret = devm_register_power_off_handler(&i2c->dev, &axp20x->power_off_hb);
+ if (ret)
+ dev_warn(&i2c->dev, "failed to register power-off handler\n");

dev_info(&i2c->dev, "AXP20X driver loaded\n");

@@ -218,11 +221,6 @@ static int axp20x_i2c_remove(struct i2c_client *i2c)
{
struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);

- if (axp20x == axp20x_pm_power_off) {
- axp20x_pm_power_off = NULL;
- pm_power_off = NULL;
- }
-
mfd_remove_devices(axp20x->dev);
regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);

diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index d0e31a2..8f330af 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -175,6 +175,7 @@ struct axp20x_dev {
struct regmap *regmap;
struct regmap_irq_chip_data *regmap_irqc;
long variant;
+ struct power_off_handler_block power_off_hb;
};

#endif /* __LINUX_MFD_AXP20X_H */
--
1.9.1