From 9b1733d659d764140c825c0f32dab43de27410be Mon Sep 17 00:00:00 2001 From: Dawid Niedzwiecki Date: Wed, 28 Oct 2020 09:40:57 +0100 Subject: atomic: remove deprecated atomic functions Remove deprecated_atomic_* functions since only atomic_* are now used. BUG=b:169151160 BRANCH=none TEST=buildall Signed-off-by: Dawid Niedzwiecki Change-Id: I6b25cc81aec126662ed779cf0f9309dcb77a754e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2505142 Reviewed-by: Jett Rink Reviewed-by: Jack Rosenthal --- core/host/atomic.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'core/host') diff --git a/core/host/atomic.h b/core/host/atomic.h index 0e662c9106..aaf990dac1 100644 --- a/core/host/atomic.h +++ b/core/host/atomic.h @@ -13,60 +13,26 @@ typedef int atomic_t; typedef atomic_t atomic_val_t; -/* - * The atomic_* functions are marked as deprecated as a part of the process of - * transaction to Zephyr compatible atomic functions. These prefixes will be - * removed in the following patches. Please see b:169151160 for more details. - */ - -static inline void deprecated_atomic_clear_bits(uint32_t volatile *addr, - uint32_t bits) -{ - __sync_and_and_fetch(addr, ~bits); -} - static inline void atomic_clear_bits(atomic_t *addr, atomic_val_t bits) { __atomic_fetch_and(addr, ~bits, __ATOMIC_SEQ_CST); } -static inline void deprecated_atomic_or(uint32_t volatile *addr, uint32_t bits) -{ - __sync_or_and_fetch(addr, bits); -} - static inline atomic_val_t atomic_or(atomic_t *addr, atomic_val_t bits) { return __atomic_fetch_or(addr, bits, __ATOMIC_SEQ_CST); } -static inline void deprecated_atomic_add(uint32_t volatile *addr, - uint32_t value) -{ - __sync_add_and_fetch(addr, value); -} - static inline atomic_val_t atomic_add(atomic_t *addr, atomic_val_t value) { return __atomic_fetch_add(addr, value, __ATOMIC_SEQ_CST); } -static inline void deprecated_atomic_sub(uint32_t volatile *addr, - uint32_t value) -{ - __sync_sub_and_fetch(addr, value); -} - static inline atomic_val_t atomic_sub(atomic_t *addr, atomic_val_t value) { return __atomic_fetch_sub(addr, value, __ATOMIC_SEQ_CST); } -static inline uint32_t deprecated_atomic_read_clear(uint32_t volatile *addr) -{ - return __sync_fetch_and_and(addr, 0); -} - static inline atomic_val_t atomic_read_clear(atomic_t *addr) { return __atomic_exchange_n(addr, 0, __ATOMIC_SEQ_CST); -- cgit v1.2.1