diff options
| author | Pavel Machek <pavel@suse.cz> | 2005-04-18 17:39:24 -0700 |
|---|---|---|
| committer | Greg K-H <gregkh@suse.de> | 2005-04-18 17:39:24 -0700 |
| commit | ba9d35fb01852e195f2a4ca975fdcd6578b52c78 (patch) | |
| tree | e0609e6e255f4875ba5ab69bb0aa169d8c5edae8 /drivers/usb/gadget | |
| parent | 9a5d3e98dd31abcecbf4533b81866d440cc0f106 (diff) | |
| download | blackbird-op-linux-ba9d35fb01852e195f2a4ca975fdcd6578b52c78.tar.gz blackbird-op-linux-ba9d35fb01852e195f2a4ca975fdcd6578b52c78.zip | |
[PATCH] USB: fix up remaining pm_message_t usages
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index b66ea5a6ed79..98cbcbc16cc1 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -2809,17 +2809,15 @@ static int __exit omap_udc_remove(struct device *dev) return 0; } -/* suspend/resume/wakeup from sysfs (echo > power/state) */ - -static int omap_udc_suspend(struct device *dev, u32 state, u32 level) +static int omap_udc_suspend(struct device *dev, pm_message_t state, u32 level) { if (level != 0) return 0; DBG("suspend, state %d\n", state); omap_pullup(&udc->gadget, 0); - udc->gadget.dev.power.power_state = 3; - udc->gadget.dev.parent->power.power_state = 3; + udc->gadget.dev.power.power_state = PMSG_SUSPEND; + udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND; return 0; } @@ -2829,8 +2827,8 @@ static int omap_udc_resume(struct device *dev, u32 level) return 0; DBG("resume + wakeup/SRP\n"); - udc->gadget.dev.parent->power.power_state = 0; - udc->gadget.dev.power.power_state = 0; + udc->gadget.dev.parent->power.power_state = PMSG_ON; + udc->gadget.dev.power.power_state = PMSG_ON; omap_pullup(&udc->gadget, 1); /* maybe the host would enumerate us if we nudged it */ |
