summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/blackfin.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2010-12-02 11:27:35 +0100
committerFelipe Balbi <balbi@ti.com>2010-12-10 09:21:26 +0100
commit496351413a227a6c0ea1a704d3d4c775d413fd08 (patch)
treee688488db9439ba5de6706260f0db4da612cc9d7 /drivers/usb/musb/blackfin.c
parentusb: musb: drop the set_clock magic (diff)
downloadlinux-496351413a227a6c0ea1a704d3d4c775d413fd08.tar.xz
linux-496351413a227a6c0ea1a704d3d4c775d413fd08.zip
usb: musb: drop musb_platform_save/restore_context
... that can be easily folded into the musb_platform_suspend/resume calls. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/blackfin.c')
-rw-r--r--drivers/usb/musb/blackfin.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 03cb001c0e19..8c9c5fc3a6ca 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -406,9 +406,7 @@ static int bfin_musb_init(struct musb *musb)
return 0;
}
-#ifdef CONFIG_PM
-void musb_platform_save_context(struct musb *musb,
- struct musb_context_registers *musb_context)
+static int bfin_musb_suspend(struct musb *musb)
{
if (is_host_active(musb))
/*
@@ -418,14 +416,16 @@ void musb_platform_save_context(struct musb *musb,
* wakeup event.
*/
gpio_set_value(musb->config->gpio_vrsel, 0);
+
+ return 0;
}
-void musb_platform_restore_context(struct musb *musb,
- struct musb_context_registers *musb_context)
+static int bfin_musb_resume(struct musb *musb)
{
bfin_musb_reg_init(musb);
+
+ return 0;
}
-#endif
static int bfin_musb_exit(struct musb *musb)
{
@@ -446,6 +446,9 @@ static const struct musb_platform_ops bfin_ops = {
.set_mode = bfin_musb_set_mode,
.try_idle = bfin_musb_try_idle,
+ .suspend = bfin_musb_suspend,
+ .resume = bfin_musb_resume,
+
.vbus_status = bfin_musb_vbus_status,
.set_vbus = bfin_musb_set_vbus,
};