diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2020-10-06 09:26:40 -0600 |
|---|---|---|
| committer | Jack Rosenthal <jrosenth@chromium.org> | 2020-10-06 15:59:20 +0000 |
| commit | c3872568d1f820ac4a9d1cca891be466fed7f869 (patch) | |
| tree | b659882d1653532827ae922cf77bad56d7c31718 | |
| parent | 32b7e8875e0a08290168ec7dda040d5a5db513fa (diff) | |
| download | chrome-ec-c3872568d1f820ac4a9d1cca891be466fed7f869.tar.gz | |
Fix incomplete rename (deprecated_atomic_clear -> deprecated_atomic_clear_bits)
CL:2428943 renamed deprecated_atomic_clear to
deprecated_atomic_clear_bits, but missed these two cases, as they
landed thru CQ after CL:2428943 passed the dry run.
BUG=b:170132568
BRANCH=none
TEST=buildall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I6fff582b2cf8dbf77bc8a136bc7fa81af30b2cc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2452889
Reviewed-by: Diana Z <dzigterman@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
| -rw-r--r-- | common/usbc/usb_pe_drp_sm.c | 2 | ||||
| -rw-r--r-- | zephyr/shim/include/atomic.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index 210bb9d1d8..5b4f8a65ba 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1037,7 +1037,7 @@ void pe_notify_event(int port, uint32_t event_mask) void pd_clear_events(int port, uint32_t clear_mask) { - deprecated_atomic_clear(&pe[port].events, clear_mask); + deprecated_atomic_clear_bits(&pe[port].events, clear_mask); } uint32_t pd_get_events(int port) diff --git a/zephyr/shim/include/atomic.h b/zephyr/shim/include/atomic.h index 249b5d0bd9..41260c1238 100644 --- a/zephyr/shim/include/atomic.h +++ b/zephyr/shim/include/atomic.h @@ -14,8 +14,8 @@ * definitions here are provided so we can shim-in modules using the * deprecated APIs while the transition is under way. */ -static inline void deprecated_atomic_clear(uint32_t volatile *addr, - uint32_t bits) +static inline void deprecated_atomic_clear_bits(uint32_t volatile *addr, + uint32_t bits) { atomic_and((atomic_t *)addr, bits); } |