| Message ID | E1bbFKU-0001OO-RA@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Russell, On Sun, Aug 21, 2016 at 12:05:30AM +0100, Russell King wrote: > PCMCIA suspend/resume no longer works since the commit mentioned below, > as the callbacks are no longer made. Convert the driver to the new > dev_pm_ops, which restores the suspend/resume functionality. Tested on > the arm arch Assabet platform with a pcnet_cs CF card. > > Fixes: aa8e54b559479 ("PM / sleep: Go direct_complete if driver has no callbacks") > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Looks goot to me. Can you push it upstream, please? Best Dominik
On Sat, Aug 27, 2016 at 02:05:22PM +0200, Dominik Brodowski wrote: > Russell, > > On Sun, Aug 21, 2016 at 12:05:30AM +0100, Russell King wrote: > > PCMCIA suspend/resume no longer works since the commit mentioned below, > > as the callbacks are no longer made. Convert the driver to the new > > dev_pm_ops, which restores the suspend/resume functionality. Tested on > > the arm arch Assabet platform with a pcnet_cs CF card. > > > > Fixes: aa8e54b559479 ("PM / sleep: Go direct_complete if driver has no callbacks") > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > > Looks goot to me. Can you push it upstream, please? I can do - should I take that as an Acked-by? Thanks.
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 489ea1098c96..69b5e811ea2b 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -977,7 +977,7 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) /************************ runtime PM support ***************************/ -static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); +static int pcmcia_dev_suspend(struct device *dev); static int pcmcia_dev_resume(struct device *dev); static int runtime_suspend(struct device *dev) @@ -985,7 +985,7 @@ static int runtime_suspend(struct device *dev) int rc; device_lock(dev); - rc = pcmcia_dev_suspend(dev, PMSG_SUSPEND); + rc = pcmcia_dev_suspend(dev); device_unlock(dev); return rc; } @@ -1135,7 +1135,7 @@ ATTRIBUTE_GROUPS(pcmcia_dev); /* PM support, also needed for reset */ -static int pcmcia_dev_suspend(struct device *dev, pm_message_t state) +static int pcmcia_dev_suspend(struct device *dev) { struct pcmcia_device *p_dev = to_pcmcia_dev(dev); struct pcmcia_driver *p_drv = NULL; @@ -1410,6 +1410,9 @@ static struct class_interface pcmcia_bus_interface __refdata = { .remove_dev = &pcmcia_bus_remove_socket, }; +static const struct dev_pm_ops pcmcia_bus_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(pcmcia_dev_suspend, pcmcia_dev_resume) +}; struct bus_type pcmcia_bus_type = { .name = "pcmcia", @@ -1418,8 +1421,7 @@ struct bus_type pcmcia_bus_type = { .dev_groups = pcmcia_dev_groups, .probe = pcmcia_device_probe, .remove = pcmcia_device_remove, - .suspend = pcmcia_dev_suspend, - .resume = pcmcia_dev_resume, + .pm = &pcmcia_bus_pm_ops, };
PCMCIA suspend/resume no longer works since the commit mentioned below, as the callbacks are no longer made. Convert the driver to the new dev_pm_ops, which restores the suspend/resume functionality. Tested on the arm arch Assabet platform with a pcnet_cs CF card. Fixes: aa8e54b559479 ("PM / sleep: Go direct_complete if driver has no callbacks") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/pcmcia/ds.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)