From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v3 17/47] mfd: tps65910: Register with kernel power-off handler Date: Mon, 3 Nov 2014 17:54:40 +0000 Message-ID: <20141103175440.GL12011@x1> References: <1414425354-10359-1-git-send-email-linux@roeck-us.net> <1414425354-10359-18-git-send-email-linux@roeck-us.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1414425354-10359-18-git-send-email-linux@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org To: Guenter Roeck Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Samuel Ortiz List-Id: linux-pm@vger.kernel.org On Mon, 27 Oct 2014, Guenter Roeck wrote: > Register with kernel power-off handler instead of setting pm_power_of= f > directly. Register with low priority to reflect that the original cod= e > only sets pm_power_off if it was not already set. >=20 > Cc: Samuel Ortiz > Cc: Lee Jones > Signed-off-by: Guenter Roeck > --- > 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 poweroff handler priority > - Use dev_warn instead of dev_err >=20 > drivers/mfd/tps65910.c | 27 ++++++++++++++++++--------- > include/linux/mfd/tps65910.h | 3 +++ > 2 files changed, 21 insertions(+), 9 deletions(-) Acked-by: Lee Jones > diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c > index 7612d89..3c94dbf 100644 > --- a/drivers/mfd/tps65910.c > +++ b/drivers/mfd/tps65910.c > @@ -23,6 +23,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -437,19 +439,20 @@ struct tps65910_board *tps65910_parse_dt(struct= i2c_client *client, > } > #endif > =20 > -static struct i2c_client *tps65910_i2c_client; > -static void tps65910_power_off(void) > +static int tps65910_power_off(struct notifier_block *this, > + unsigned long unused1, void *unused2) > { > - struct tps65910 *tps65910; > - > - tps65910 =3D dev_get_drvdata(&tps65910_i2c_client->dev); > + struct tps65910 *tps65910 =3D container_of(this, struct tps65910, > + power_off_nb); > =20 > if (tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL, > DEVCTRL_PWR_OFF_MASK) < 0) > - return; > + return NOTIFY_DONE; > =20 > tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL, > DEVCTRL_DEV_ON_MASK); > + > + return NOTIFY_DONE; > } > =20 > static int tps65910_i2c_probe(struct i2c_client *i2c, > @@ -505,9 +508,13 @@ static int tps65910_i2c_probe(struct i2c_client = *i2c, > tps65910_ck32k_init(tps65910, pmic_plat_data); > tps65910_sleepinit(tps65910, pmic_plat_data); > =20 > - if (pmic_plat_data->pm_off && !pm_power_off) { > - tps65910_i2c_client =3D i2c; > - pm_power_off =3D tps65910_power_off; > + if (pmic_plat_data->pm_off) { > + tps65910->power_off_nb.notifier_call =3D tps65910_power_off; > + tps65910->power_off_nb.priority =3D POWER_OFF_PRIORITY_LOW; > + ret =3D register_power_off_handler(&tps65910->power_off_nb); > + if (ret) > + dev_warn(&i2c->dev, > + "failed to register power-off handler\n"); > } > =20 > ret =3D mfd_add_devices(tps65910->dev, -1, > @@ -527,6 +534,8 @@ static int tps65910_i2c_remove(struct i2c_client = *i2c) > { > struct tps65910 *tps65910 =3D i2c_get_clientdata(i2c); > =20 > + unregister_power_off_handler(&tps65910->power_off_nb); > + > tps65910_irq_exit(tps65910); > mfd_remove_devices(tps65910->dev); > =20 > diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps6591= 0.h > index 6483a6f..94876c4 100644 > --- a/include/linux/mfd/tps65910.h > +++ b/include/linux/mfd/tps65910.h > @@ -905,6 +905,9 @@ struct tps65910 { > /* IRQ Handling */ > int chip_irq; > struct regmap_irq_chip_data *irq_data; > + > + /* Power-off handling */ > + struct notifier_block power_off_nb; > }; > =20 > struct tps65910_platform_data { --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog