diff options
author | Felipe Balbi <balbi@ti.com> | 2010-12-02 06:17:53 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2010-12-10 03:21:32 -0500 |
commit | 784173723e2fd23332af948a90612950964cd140 (patch) | |
tree | a250e86b53fa3625c2a589704b8fa0efc57a4f4f /drivers/usb/musb | |
parent | fcd22e3b1f12e026dfefca20c97ff550a0e11b2b (diff) |
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/musb')
-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) | |||
2306 | musb_read_rxhubport(musb_base, i); | 2306 | musb_read_rxhubport(musb_base, i); |
2307 | } | 2307 | } |
2308 | } | 2308 | } |
2309 | |||
2310 | musb_platform_suspend(musb); | ||
2311 | } | 2309 | } |
2312 | 2310 | ||
2313 | static void musb_restore_context(struct musb *musb) | 2311 | static void musb_restore_context(struct musb *musb) |
@@ -2317,8 +2315,6 @@ static void musb_restore_context(struct musb *musb) | |||
2317 | void __iomem *ep_target_regs; | 2315 | void __iomem *ep_target_regs; |
2318 | void __iomem *epio; | 2316 | void __iomem *epio; |
2319 | 2317 | ||
2320 | musb_platform_resume(musb); | ||
2321 | |||
2322 | if (is_host_enabled(musb)) { | 2318 | if (is_host_enabled(musb)) { |
2323 | musb_writew(musb_base, MUSB_FRAME, musb->context.frame); | 2319 | musb_writew(musb_base, MUSB_FRAME, musb->context.frame); |
2324 | musb_writeb(musb_base, MUSB_TESTMODE, musb->context.testmode); | 2320 | 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 { | |||
257 | * struct musb_platform_ops - Operations passed to musb_core by HW glue layer | 257 | * struct musb_platform_ops - Operations passed to musb_core by HW glue layer |
258 | * @init: turns on clocks, sets up platform-specific registers, etc | 258 | * @init: turns on clocks, sets up platform-specific registers, etc |
259 | * @exit: undoes @init | 259 | * @exit: undoes @init |
260 | * @suspend: platform-specific suspend, e.g. context save | ||
261 | * @resume: platform-specific resume, e.g. context restore | ||
262 | * @set_mode: forcefully changes operating mode | 260 | * @set_mode: forcefully changes operating mode |
263 | * @try_ilde: tries to idle the IP | 261 | * @try_ilde: tries to idle the IP |
264 | * @vbus_status: returns vbus status if possible | 262 | * @vbus_status: returns vbus status if possible |
@@ -268,9 +266,6 @@ struct musb_platform_ops { | |||
268 | int (*init)(struct musb *musb); | 266 | int (*init)(struct musb *musb); |
269 | int (*exit)(struct musb *musb); | 267 | int (*exit)(struct musb *musb); |
270 | 268 | ||
271 | int (*suspend)(struct musb *musb); | ||
272 | int (*resume)(struct musb *musb); | ||
273 | |||
274 | void (*enable)(struct musb *musb); | 269 | void (*enable)(struct musb *musb); |
275 | void (*disable)(struct musb *musb); | 270 | void (*disable)(struct musb *musb); |
276 | 271 | ||
@@ -660,20 +655,4 @@ static inline int musb_platform_exit(struct musb *musb) | |||
660 | return musb->ops->exit(musb); | 655 | return musb->ops->exit(musb); |
661 | } | 656 | } |
662 | 657 | ||
663 | static inline int musb_platform_suspend(struct musb *musb) | ||
664 | { | ||
665 | if (!musb->ops->suspend) | ||
666 | return 0; | ||
667 | |||
668 | return musb->ops->suspend(musb); | ||
669 | } | ||
670 | |||
671 | static inline int musb_platform_resume(struct musb *musb) | ||
672 | { | ||
673 | if (!musb->ops->resume) | ||
674 | return 0; | ||
675 | |||
676 | return musb->ops->resume(musb); | ||
677 | } | ||
678 | |||
679 | #endif /* __MUSB_CORE_H__ */ | 658 | #endif /* __MUSB_CORE_H__ */ |