Messages in this thread | | | Date | Mon, 20 Jun 2022 10:48:01 +0200 | Subject | Re: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc | From | Hans de Goede <> |
| |
Hi,
On 6/16/22 19:10, Andy Shevchenko wrote: > Letting the compiler remove these functions when the kernel is built > without CONFIG_PM_SLEEP support is simpler and less heavier for builds > than the use of __maybe_unused attributes. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
I see that this basically converts the code to the new way of dealing with pm_ops, so after a second look:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> --- > drivers/mfd/intel_soc_pmic_chtwc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c > index 1cbe2bcce530..9216f0d34206 100644 > --- a/drivers/mfd/intel_soc_pmic_chtwc.c > +++ b/drivers/mfd/intel_soc_pmic_chtwc.c > @@ -222,7 +222,7 @@ static void cht_wc_shutdown(struct i2c_client *client) > disable_irq(pmic->irq); > } > > -static int __maybe_unused cht_wc_suspend(struct device *dev) > +static int cht_wc_suspend(struct device *dev) > { > struct intel_soc_pmic *pmic = dev_get_drvdata(dev); > > @@ -231,7 +231,7 @@ static int __maybe_unused cht_wc_suspend(struct device *dev) > return 0; > } > > -static int __maybe_unused cht_wc_resume(struct device *dev) > +static int cht_wc_resume(struct device *dev) > { > struct intel_soc_pmic *pmic = dev_get_drvdata(dev); > > @@ -239,7 +239,7 @@ static int __maybe_unused cht_wc_resume(struct device *dev) > > return 0; > } > -static SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume); > > static const struct i2c_device_id cht_wc_i2c_id[] = { > { } > @@ -253,7 +253,7 @@ static const struct acpi_device_id cht_wc_acpi_ids[] = { > static struct i2c_driver cht_wc_driver = { > .driver = { > .name = "CHT Whiskey Cove PMIC", > - .pm = &cht_wc_pm_ops, > + .pm = pm_sleep_ptr(&cht_wc_pm_ops), > .acpi_match_table = cht_wc_acpi_ids, > }, > .probe_new = cht_wc_probe,
| |