2009-07-21 08:06:20

by Dmitry Torokhov

Subject: [RFC/RFT] serio - switch to using dev_pm_ops

And here is the serio conversion to the new PM infrastructure.

--
Dmitry

Input: serio - switch to using dev_pm_ops

From: Dmitry Torokhov <[email protected]>

Signed-off-by: Dmitry Torokhov <[email protected]>
---

drivers/input/serio/serio.c | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)


diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index d66f494..4251a63 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -931,15 +931,11 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
#endif /* CONFIG_HOTPLUG */

#ifdef CONFIG_PM
-static int serio_suspend(struct device *dev, pm_message_t state)
+static int serio_suspend(struct device *dev)
{
struct serio *serio = to_serio_port(dev);

- if (!serio->suspended && state.event == PM_EVENT_SUSPEND)
- serio_cleanup(serio);
-
- serio->suspended = state.event == PM_EVENT_SUSPEND ||
- state.event == PM_EVENT_FREEZE;
+ serio_cleanup(serio);

return 0;
}
@@ -952,15 +948,24 @@ static int serio_resume(struct device *dev)
* Driver reconnect can take a while, so better let kseriod
* deal with it.
*/
- if (serio->suspended) {
- serio->suspended = false;
- serio_queue_event(serio, NULL, SERIO_RECONNECT_PORT);
- }
+ serio_queue_event(serio, NULL, SERIO_RECONNECT_PORT);

return 0;
}
+#else
+#define serio_suspend NULL
+#define serio_resume NULL
#endif /* CONFIG_PM */

+static const struct dev_pm_ops serio_pm_ops = {
+ .suspend = serio_suspend,
+ .resume = serio_resume,
+ .poweroff = serio_suspend,
+ .thaw = serio_resume,
+};
+
+
+
/* called from serio_driver->connect/disconnect methods under serio_mutex */
int serio_open(struct serio *serio, struct serio_driver *drv)
{
@@ -1014,10 +1019,7 @@ static struct bus_type serio_bus = {
.probe = serio_driver_probe,
.remove = serio_driver_remove,
.shutdown = serio_shutdown,
-#ifdef CONFIG_PM
- .suspend = serio_suspend,
- .resume = serio_resume,
-#endif
+ .pm = &serio_pm_ops,
};

static int __init serio_init(void)

2009-07-21 21:48:09

by Alan Jenkins

Subject: Re: [RFC/RFT] serio - switch to using dev_pm_ops

> drivers/input/serio/serio.c | 30 ++++++++++++++++--------------
> 1 files changed, 16 insertions(+), 14 deletions(-)

> - if (!serio->suspended && state.event == PM_EVENT_SUSPEND)
> - serio_cleanup(serio);
> -
> - serio->suspended = state.event == PM_EVENT_SUSPEND ||
> - state.event == PM_EVENT_FREEZE;

> - if (serio->suspended) {
> - serio->suspended = false;
> - serio_queue_event(serio, NULL, SERIO_RECONNECT_PORT);
> - }

It looks like you should be able to remove the suspended field of
struct serio. Or is it used somewhere else?

Regards
Alan

2009-07-22 16:38:39

by Dmitry Torokhov

Subject: Re: [RFC/RFT] serio - switch to using dev_pm_ops

On Tue, Jul 21, 2009 at 10:48:05PM +0100, Alan Jenkins wrote:
> > drivers/input/serio/serio.c | 30 ++++++++++++++++--------------
> > 1 files changed, 16 insertions(+), 14 deletions(-)
>
> > - if (!serio->suspended && state.event == PM_EVENT_SUSPEND)
> > - serio_cleanup(serio);
> > -
> > - serio->suspended = state.event == PM_EVENT_SUSPEND ||
> > - state.event == PM_EVENT_FREEZE;
>
> > - if (serio->suspended) {
> > - serio->suspended = false;
> > - serio_queue_event(serio, NULL, SERIO_RECONNECT_PORT);
> > - }
>
> It looks like you should be able to remove the suspended field of
> struct serio. Or is it used somewhere else?
>

No, it is not needed now, thanks for noticing.

--
Dmitry