Re: [PATCH 3/3] hwmon: (w83627ehf) Switch to SIMPLE_DEV_PM_OPS

From: Armin Wolf <W_Armin@gmx.de>
To: unlisted-recipients:; (no To-header on input)
Cc: linux-hwmon@vger.kernel.org
Subject: Re: [PATCH 3/3] hwmon: (w83627ehf) Switch to SIMPLE_DEV_PM_OPS
Date: Mon, 12 Jul 2021 16:46:24 +0200	[thread overview]
Message-ID: <9e9c73ed-450c-fda6-539c-8dfbab1009a1@gmx.de> (raw)
In-Reply-To: <20210712023825.GA3552025@roeck-us.net>

Am 12.07.21 um 04:38 schrieb Guenter Roeck:
> On Fri, Jul 09, 2021 at 08:45:01PM +0200, W_Armin@gmx.de wrote:
>> From: Armin Wolf <W_Armin@gmx.de>
>>
>> Use SIMPLE_DEV_PM_OPS() to also assign poweroff
>> and thaw callbacks. Remove the now obsolete checking
>> of CONFIG_PM too.
>>
>> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> 0-day says:
>
> drivers/hwmon/w83627ehf.c:1954:6: error: 'struct w83627ehf_data' has no member named 'vbat'
>
> .... and there was me thinking that this code was at least compile tested.
> Apparently not. Sigh. I dropped this patch.
>
> Guenter

Well, i even tested the patches on real hardware (Asrock AM2NF3-VSTA), however it seems that i forgot to test them
with CONFIG_PM disabled. I already found the problem and will submit a updated patch series soon
(after more testing this time).
Sorry for not doing that sooner.

>> ---
>>   drivers/hwmon/w83627ehf.c | 19 ++++---------------
>>   1 file changed, 4 insertions(+), 15 deletions(-)
>>
>> --
>> 2.20.1
>>
>> diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
>> index 19af84574324..243b9bd8d64f 100644
>> --- a/drivers/hwmon/w83627ehf.c
>> +++ b/drivers/hwmon/w83627ehf.c
>> @@ -1946,8 +1946,7 @@ static int __init w83627ehf_probe(struct platform_device *pdev)
>>   	return PTR_ERR_OR_ZERO(hwmon_dev);
>>   }
>>
>> -#ifdef CONFIG_PM
>> -static int w83627ehf_suspend(struct device *dev)
>> +static int __maybe_unused w83627ehf_suspend(struct device *dev)
>>   {
>>   	struct w83627ehf_data *data = w83627ehf_update_device(dev);
>>
>> @@ -1958,7 +1957,7 @@ static int w83627ehf_suspend(struct device *dev)
>>   	return 0;
>>   }
>>
>> -static int w83627ehf_resume(struct device *dev)
>> +static int __maybe_unused w83627ehf_resume(struct device *dev)
>>   {
>>   	struct w83627ehf_data *data = dev_get_drvdata(dev);
>>   	int i;
>> @@ -2013,22 +2012,12 @@ static int w83627ehf_resume(struct device *dev)
>>   	return 0;
>>   }
>>
>> -static const struct dev_pm_ops w83627ehf_dev_pm_ops = {
>> -	.suspend = w83627ehf_suspend,
>> -	.resume = w83627ehf_resume,
>> -	.freeze = w83627ehf_suspend,
>> -	.restore = w83627ehf_resume,
>> -};
>> -
>> -#define W83627EHF_DEV_PM_OPS	(&w83627ehf_dev_pm_ops)
>> -#else
>> -#define W83627EHF_DEV_PM_OPS	NULL
>> -#endif /* CONFIG_PM */
>> +static SIMPLE_DEV_PM_OPS(w83627ehf_dev_pm_ops, w83627ehf_suspend, w83627ehf_resume);
>>
>>   static struct platform_driver w83627ehf_driver = {
>>   	.driver = {
>>   		.name	= DRVNAME,
>> -		.pm	= W83627EHF_DEV_PM_OPS,
>> +		.pm	= &w83627ehf_dev_pm_ops,
>>   	},
>>   };