diff options
| author | Felipe Balbi <balbi@ti.com> | 2010-12-02 13:17:53 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2010-12-10 10:21:32 +0200 |
| commit | 784173723e2fd23332af948a90612950964cd140 (patch) | |
| tree | a250e86b53fa3625c2a589704b8fa0efc57a4f4f /drivers/usb | |
| parent | fcd22e3b1f12e026dfefca20c97ff550a0e11b2b (diff) | |
| download | linux-784173723e2fd23332af948a90612950964cd140.tar.gz linux-784173723e2fd23332af948a90612950964cd140.tar.bz2 linux-784173723e2fd23332af948a90612950964cd140.zip | |
usb: musb: drop musb_platform_suspend/resume
all glue layers are now fully moved to the
new setup. We are now using dev_pm_ops to
implement suspend/resume functionality and
thus, musb_platform_suspend/resume has become
deprecated and useless.
This patch drops those function pointers and
its uses.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 21 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 437a4c8c0128..e24bb41df1dc 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2306,8 +2306,6 @@ static void musb_save_context(struct musb *musb) musb_read_rxhubport(musb_base, i); } } - - musb_platform_suspend(musb); } static void musb_restore_context(struct musb *musb) @@ -2317,8 +2315,6 @@ static void musb_restore_context(struct musb *musb) void __iomem *ep_target_regs; void __iomem *epio; - musb_platform_resume(musb); - if (is_host_enabled(musb)) { musb_writew(musb_base, MUSB_FRAME, musb->context.frame); musb_writeb(musb_base, MUSB_TESTMODE, musb->context.testmode); diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index f8efd543c5f2..9a3c71fce2b4 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -257,8 +257,6 @@ enum musb_g_ep0_state { * struct musb_platform_ops - Operations passed to musb_core by HW glue layer * @init: turns on clocks, sets up platform-specific registers, etc * @exit: undoes @init - * @suspend: platform-specific suspend, e.g. context save - * @resume: platform-specific resume, e.g. context restore * @set_mode: forcefully changes operating mode * @try_ilde: tries to idle the IP * @vbus_status: returns vbus status if possible @@ -268,9 +266,6 @@ struct musb_platform_ops { int (*init)(struct musb *musb); int (*exit)(struct musb *musb); - int (*suspend)(struct musb *musb); - int (*resume)(struct musb *musb); - void (*enable)(struct musb *musb); void (*disable)(struct musb *musb); @@ -660,20 +655,4 @@ static inline int musb_platform_exit(struct musb *musb) return musb->ops->exit(musb); } -static inline int musb_platform_suspend(struct musb *musb) -{ - if (!musb->ops->suspend) - return 0; - - return musb->ops->suspend(musb); -} - -static inline int musb_platform_resume(struct musb *musb) -{ - if (!musb->ops->resume) - return 0; - - return musb->ops->resume(musb); -} - #endif /* __MUSB_CORE_H__ */ |