aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/blackfin.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2010-12-02 05:27:35 -0500
committerFelipe Balbi <balbi@ti.com>2010-12-10 03:21:26 -0500
commit496351413a227a6c0ea1a704d3d4c775d413fd08 (patch)
treee688488db9439ba5de6706260f0db4da612cc9d7 /drivers/usb/musb/blackfin.c
parentfa56df915d101770a495569473b4c13b1904087b (diff)
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)
406 return 0; 406 return 0;
407} 407}
408 408
409#ifdef CONFIG_PM 409static int bfin_musb_suspend(struct musb *musb)
410void musb_platform_save_context(struct musb *musb,
411 struct musb_context_registers *musb_context)
412{ 410{
413 if (is_host_active(musb)) 411 if (is_host_active(musb))
414 /* 412 /*
@@ -418,14 +416,16 @@ void musb_platform_save_context(struct musb *musb,
418 * wakeup event. 416 * wakeup event.
419 */ 417 */
420 gpio_set_value(musb->config->gpio_vrsel, 0); 418 gpio_set_value(musb->config->gpio_vrsel, 0);
419
420 return 0;
421} 421}
422 422
423void musb_platform_restore_context(struct musb *musb, 423static int bfin_musb_resume(struct musb *musb)
424 struct musb_context_registers *musb_context)
425{ 424{
426 bfin_musb_reg_init(musb); 425 bfin_musb_reg_init(musb);
426
427 return 0;
427} 428}
428#endif
429 429
430static int bfin_musb_exit(struct musb *musb) 430static int bfin_musb_exit(struct musb *musb)
431{ 431{
@@ -446,6 +446,9 @@ static const struct musb_platform_ops bfin_ops = {
446 .set_mode = bfin_musb_set_mode, 446 .set_mode = bfin_musb_set_mode,
447 .try_idle = bfin_musb_try_idle, 447 .try_idle = bfin_musb_try_idle,
448 448
449 .suspend = bfin_musb_suspend,
450 .resume = bfin_musb_resume,
451
449 .vbus_status = bfin_musb_vbus_status, 452 .vbus_status = bfin_musb_vbus_status,
450 .set_vbus = bfin_musb_set_vbus, 453 .set_vbus = bfin_musb_set_vbus,
451}; 454};