Messages in this thread | | | Date | Mon, 2 Feb 2015 09:23:11 -0800 | From | Guenter Roeck <> | Subject | Re: [PATCH] hwmon: tmp102: add hibernation callbacks |
| |
On Mon, Feb 02, 2015 at 07:14:31PM +0200, grygorii.strashko@linaro.org wrote: > From: Grygorii Strashko <Grygorii.Strashko@linaro.org> > > Setting a dev_pm_ops suspend/resume pair but not a set of > hibernation functions means those pm functions will not be > called upon hibernation. > Fix this by using SIMPLE_DEV_PM_OPS, which appropriately > assigns the suspend and hibernation handlers. > > Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org> > --- > drivers/hwmon/tmp102.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c > index 6748b45..4f790f5 100644 > --- a/drivers/hwmon/tmp102.c > +++ b/drivers/hwmon/tmp102.c > @@ -281,17 +281,10 @@ static int tmp102_resume(struct device *dev) > config &= ~TMP102_CONF_SD; > return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config); > } > - > -static const struct dev_pm_ops tmp102_dev_pm_ops = { > - .suspend = tmp102_suspend, > - .resume = tmp102_resume, > -}; > - > -#define TMP102_DEV_PM_OPS (&tmp102_dev_pm_ops) > -#else > -#define TMP102_DEV_PM_OPS NULL > #endif /* CONFIG_PM */ > > +SIMPLE_DEV_PM_OPS(tmp102_dev_pm_ops, tmp102_suspend, tmp102_resume); > +
SIMPLE_DEV_PM_OPS is defined in the context of CONFIG_PM_SLEEP, while tmp102_suspend and tmp102_resume above are defined in the context of CONFIG_PM. This will result in situations where the functions are defined but not used, resulting in build warnings.
Please change the condition in the driver to #ifdef CONFIG_PM_SLEEP to avoid this problem.
Thanks, Guenter
| |