diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2020-09-23 15:21:18 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-09-29 16:30:59 +0000 |
commit | d4be394be0b91a71b2f16ca476114b7470bc630f (patch) | |
tree | e08dd7e428be1d27b65c4bae3ba8a47e40c8b1a5 /driver | |
parent | 9513a63a626021b071199d02b7c73112eb746833 (diff) | |
download | chrome-ec-d4be394be0b91a71b2f16ca476114b7470bc630f.tar.gz |
tree: rename atomic_* functions to deprecated_atomic_*
We will move to an API compatible with Zephyr's API. See the bug for
complete rationale and plan.
BUG=b:169151160
BRANCH=none
TEST=buildall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Id611f663446abf00b24298a669f2ae47fef7f632
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2427507
Tested-by: Dawid Niedźwiecki <dn@semihalf.com>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'driver')
-rw-r--r-- | driver/charger/sm5803.c | 4 | ||||
-rw-r--r-- | driver/ppc/aoz1380.c | 9 | ||||
-rw-r--r-- | driver/ppc/nx20p348x.c | 4 | ||||
-rw-r--r-- | driver/ppc/sn5s330.c | 4 | ||||
-rw-r--r-- | driver/ppc/syv682x.c | 4 | ||||
-rw-r--r-- | driver/tcpm/tcpci.c | 4 |
6 files changed, 15 insertions, 14 deletions
diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c index fe501acd47..a7b7611d98 100644 --- a/driver/charger/sm5803.c +++ b/driver/charger/sm5803.c @@ -945,7 +945,7 @@ void sm5803_handle_interrupt(int chgnum) static void sm5803_irq_deferred(void) { int i; - uint32_t pending = atomic_read_clear(&irq_pending); + uint32_t pending = deprecated_atomic_read_clear(&irq_pending); for (i = 0; i < CHARGER_NUM; i++) if (BIT(i) & pending) @@ -955,7 +955,7 @@ DECLARE_DEFERRED(sm5803_irq_deferred); void sm5803_interrupt(int chgnum) { - atomic_or(&irq_pending, BIT(chgnum)); + deprecated_atomic_or(&irq_pending, BIT(chgnum)); hook_call_deferred(&sm5803_irq_deferred_data, 0); } diff --git a/driver/ppc/aoz1380.c b/driver/ppc/aoz1380.c index 42239dd168..163c8db2ed 100644 --- a/driver/ppc/aoz1380.c +++ b/driver/ppc/aoz1380.c @@ -32,8 +32,9 @@ static uint32_t irq_pending; /* Bitmask of ports signaling an interrupt. */ #define AOZ1380_FLAGS_INT_ON_DISCONNECT BIT(2) static uint32_t flags[CONFIG_USB_PD_PORT_MAX_COUNT]; -#define AOZ1380_SET_FLAG(port, flag) atomic_or(&flags[port], (flag)) -#define AOZ1380_CLR_FLAG(port, flag) atomic_clear(&flags[port], (flag)) +#define AOZ1380_SET_FLAG(port, flag) deprecated_atomic_or(&flags[port], (flag)) +#define AOZ1380_CLR_FLAG(port, flag) \ + deprecated_atomic_clear(&flags[port], (flag)) static int aoz1380_init(int port) { @@ -143,7 +144,7 @@ static void aoz1380_handle_interrupt(int port) static void aoz1380_irq_deferred(void) { int i; - uint32_t pending = atomic_read_clear(&irq_pending); + uint32_t pending = deprecated_atomic_read_clear(&irq_pending); for (i = 0; i < board_get_usb_pd_port_count(); i++) if (BIT(i) & pending) @@ -153,7 +154,7 @@ DECLARE_DEFERRED(aoz1380_irq_deferred); void aoz1380_interrupt(int port) { - atomic_or(&irq_pending, BIT(port)); + deprecated_atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&aoz1380_irq_deferred_data, 0); } diff --git a/driver/ppc/nx20p348x.c b/driver/ppc/nx20p348x.c index 8142681bb4..c13087fa52 100644 --- a/driver/ppc/nx20p348x.c +++ b/driver/ppc/nx20p348x.c @@ -384,7 +384,7 @@ static void nx20p348x_handle_interrupt(int port) static void nx20p348x_irq_deferred(void) { int i; - uint32_t pending = atomic_read_clear(&irq_pending); + uint32_t pending = deprecated_atomic_read_clear(&irq_pending); for (i = 0; i < board_get_usb_pd_port_count(); i++) if (BIT(i) & pending) @@ -394,7 +394,7 @@ DECLARE_DEFERRED(nx20p348x_irq_deferred); void nx20p348x_interrupt(int port) { - atomic_or(&irq_pending, BIT(port)); + deprecated_atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&nx20p348x_irq_deferred_data, 0); } diff --git a/driver/ppc/sn5s330.c b/driver/ppc/sn5s330.c index f177efa10c..0de09ca60d 100644 --- a/driver/ppc/sn5s330.c +++ b/driver/ppc/sn5s330.c @@ -712,7 +712,7 @@ static void sn5s330_handle_interrupt(int port) static void sn5s330_irq_deferred(void) { int i; - uint32_t pending = atomic_read_clear(&irq_pending); + uint32_t pending = deprecated_atomic_read_clear(&irq_pending); for (i = 0; i < board_get_usb_pd_port_count(); i++) if (BIT(i) & pending) @@ -722,7 +722,7 @@ DECLARE_DEFERRED(sn5s330_irq_deferred); void sn5s330_interrupt(int port) { - atomic_or(&irq_pending, BIT(port)); + deprecated_atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&sn5s330_irq_deferred_data, 0); } diff --git a/driver/ppc/syv682x.c b/driver/ppc/syv682x.c index 0ea005051f..81a2034577 100644 --- a/driver/ppc/syv682x.c +++ b/driver/ppc/syv682x.c @@ -489,7 +489,7 @@ static void syv682x_handle_interrupt(int port) static void syv682x_irq_deferred(void) { int i; - uint32_t pending = atomic_read_clear(&irq_pending); + uint32_t pending = deprecated_atomic_read_clear(&irq_pending); for (i = 0; i < board_get_usb_pd_port_count(); i++) if (BIT(i) & pending) @@ -499,7 +499,7 @@ DECLARE_DEFERRED(syv682x_irq_deferred); static void syv682x_interrupt_delayed(int port, int delay) { - atomic_or(&irq_pending, BIT(port)); + deprecated_atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&syv682x_irq_deferred_data, delay * MSEC); } diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 0c281f5ffd..5af5fe0151 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -883,7 +883,7 @@ int tcpm_enqueue_message(const int port) } /* Increment atomically to ensure get_message_raw happens-before */ - atomic_add(&q->head, 1); + deprecated_atomic_add(&q->head, 1); /* Wake PD task up so it can process incoming RX messages */ task_set_event(PD_PORT_TO_TASK_ID(port), TASK_EVENT_WAKE, 0); @@ -915,7 +915,7 @@ int tcpm_dequeue_message(const int port, uint32_t *const payload, memcpy(payload, tail->payload, sizeof(tail->payload)); /* Increment atomically to ensure memcpy happens-before */ - atomic_add(&q->tail, 1); + deprecated_atomic_add(&q->tail, 1); return EC_SUCCESS; } |