On Mon, Jul 27, 2020 at 10:08 AM Vaibhav Gupta <vaibhavgupta40@xxxxxxxxx> wrote: > On Sat, Jul 25, 2020 at 01:44:44PM +0300, Andy Shevchenko wrote: > > On Sat, Jul 25, 2020 at 1:42 PM Andy Shevchenko > > <andy.shevchenko@xxxxxxxxx> wrote: ... > > The only problem here, is that the 2nd is already in the Mark's tree > > and he doesn't do rebases. > > So, it will be the other way around. > > > Concluding from yours and Bjorn's suggestion, I will drop the > device_wakeup_disable() call form .resume() and send the fix. I will also track > the drivers who got similar upgrades and went un-noticed. Thanks for doing this! > As Bjorn mentioned, the problem is that I don't have hardware to test, so I just > replicated the legacy behaviour in generic by replacing > pci_enable_wake(....,false) with device_wakeup_disable(). > > So, from now, while upgrading drivers with generic PM, should I completely drop > the pci_enable_wake(....,false) calls if both .suspend() and .resume() try to > wakeup-disable the device? I guess the best approach is to rely on the PCI core to do the right thing. But mention this change in the commit message that we will have a track of the changes properly. -- With Best Regards, Andy Shevchenko