diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 17:23:54 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:51:49 +0000 |
| commit | 34f01d9aec1eb5a71843080e11c47ca3acaaffcb (patch) | |
| tree | eccff890614b366b1928324d229e03031186c0e7 | |
| parent | 67691dada3300afea7371eec5b7dbdf47347bc5b (diff) | |
| download | chrome-ec-34f01d9aec1eb5a71843080e11c47ca3acaaffcb.tar.gz | |
Revert "stm32/usb: Add HOOK_USB_PM_CHANGE, called when USB is resumed/suspended"
This reverts commit 76927bdc5a17ddbdc9fc601b761c2a4984ecc1e9.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Iae1cf9c676788ffaf9367b0755356950e9ee8ca6
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273437
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/hooks.c | 3 | ||||
| -rw-r--r-- | core/cortex-m/ec.lds.S | 6 | ||||
| -rw-r--r-- | include/hooks.h | 10 | ||||
| -rw-r--r-- | include/link_defs.h | 4 | ||||
| -rw-r--r-- | include/usb_api.h | 7 |
5 files changed, 0 insertions, 30 deletions
diff --git a/common/hooks.c b/common/hooks.c index a4768faffb..c029c5c0da 100644 --- a/common/hooks.c +++ b/common/hooks.c @@ -50,9 +50,6 @@ static const struct hook_ptrs hook_list[] = { #ifdef CONFIG_CASE_CLOSED_DEBUG_V1 {__hooks_ccd_change, __hooks_ccd_change_end}, #endif -#ifdef CONFIG_USB_SUSPEND - {__hooks_usb_change, __hooks_usb_change_end}, -#endif {__hooks_tick, __hooks_tick_end}, {__hooks_second, __hooks_second_end}, }; diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 147e84cecb..a7c8e96227 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -233,12 +233,6 @@ SECTIONS __hooks_ccd_change_end = .; #endif -#ifdef CONFIG_USB_SUSPEND - __hooks_usb_change = .; - KEEP(*(.rodata.HOOK_USB_PM_CHANGE)) - __hooks_usb_change_end = .; -#endif - __hooks_tick = .; KEEP(*(.rodata.HOOK_TICK)) __hooks_tick_end = .; diff --git a/include/hooks.h b/include/hooks.h index 6ac9b970d7..6451a88079 100644 --- a/include/hooks.h +++ b/include/hooks.h @@ -193,16 +193,6 @@ enum hook_type { HOOK_CCD_CHANGE, #endif -#ifdef CONFIG_USB_SUSPEND - /* - * Called when there is a change in USB power management status - * (suspended or resumed). - * - * Hook routines are called from HOOKS task. - */ - HOOK_USB_PM_CHANGE, -#endif - /* * Periodic tick, every HOOK_TICK_INTERVAL. * diff --git a/include/link_defs.h b/include/link_defs.h index dd0f9dd7d6..72ac46dd35 100644 --- a/include/link_defs.h +++ b/include/link_defs.h @@ -58,10 +58,6 @@ extern const struct hook_data __hooks_battery_soc_change_end[]; extern const struct hook_data __hooks_ccd_change[]; extern const struct hook_data __hooks_ccd_change_end[]; #endif -#ifdef CONFIG_USB_SUSPEND -extern const struct hook_data __hooks_usb_change[]; -extern const struct hook_data __hooks_usb_change_end[]; -#endif extern const struct hook_data __hooks_tick[]; extern const struct hook_data __hooks_tick_end[]; extern const struct hook_data __hooks_second[]; diff --git a/include/usb_api.h b/include/usb_api.h index 481a77272c..c32515a92d 100644 --- a/include/usb_api.h +++ b/include/usb_api.h @@ -49,13 +49,6 @@ void usb_release(void); int usb_is_suspended(void); /* - * Returns true if USB remote wakeup is currently enabled by host. - * Requires CONFIG_USB_SUSPEND to be defined, always return 0 if - * CONFIG_USB_REMOTE_WAKEUP is not defined. - */ -int usb_is_remote_wakeup_enabled(void); - -/* * Preserve in non-volatile memory the state of the USB hardware registers * which cannot be simply re-initialized when powered up again. */ |