Messages in this thread | | | Date | Mon, 8 Apr 2024 18:20:03 +0200 | Subject | Re: [PATCH v1 1/1] platform/x86/intel: atomisp2: Replace deprecated UNIVERSAL_DEV_PM_OPS() | From | Hans de Goede <> |
| |
Hi Andy,
On 4/3/24 12:55 PM, Andy Shevchenko wrote: > The UNIVERSAL_DEV_PM_OPS() macro is deprecated. Replace it. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
As mentioned in the description of DEFINE_RUNTIME_DEV_PM_OPS() DEFINE_RUNTIME_DEV_PM_OPS() is NOT a 1:1 replacement for UNIVERSAL_DEV_PM_OPS() specifically it uses pm_runtime_force_suspend() / pm_runtime_force_resume() .
Specifically pm_runtime_force_suspend() may NOT get set (and in this case will not set) needs_force_resume skipping a resume + suspend cycle after a system suspend, which is a problem if firmware has touched the state of the device during the suspend/resume cycle since the device may now actually be left powered on.
It seems there is no direct replacement for UNIVERSAL_DEV_PM_OPS() without a behavior change.
Regards,
Hans
> --- > drivers/platform/x86/intel/atomisp2/pm.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/intel/atomisp2/pm.c b/drivers/platform/x86/intel/atomisp2/pm.c > index 805fc0d8515c..1081b632bd5e 100644 > --- a/drivers/platform/x86/intel/atomisp2/pm.c > +++ b/drivers/platform/x86/intel/atomisp2/pm.c > @@ -118,8 +118,7 @@ static int isp_pci_resume(struct device *dev) > return 0; > } > > -static UNIVERSAL_DEV_PM_OPS(isp_pm_ops, isp_pci_suspend, > - isp_pci_resume, NULL); > +static DEFINE_RUNTIME_DEV_PM_OPS(isp_pm_ops, isp_pci_suspend, isp_pci_resume, NULL); > > static const struct pci_device_id isp_id_table[] = { > { PCI_VDEVICE(INTEL, 0x0f38), }, > @@ -133,7 +132,7 @@ static struct pci_driver isp_pci_driver = { > .id_table = isp_id_table, > .probe = isp_probe, > .remove = isp_remove, > - .driver.pm = &isp_pm_ops, > + .driver.pm = pm_ptr(&isp_pm_ops), > }; > > module_pci_driver(isp_pci_driver);
| |