From 4de20132b029c0fd894faf1fcb7c523243dc1cc1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Oct 2023 09:54:12 +0100 Subject: [PATCH] Revert "staging: octeon: remove typedef in struct cvmx_pko_lock_t" This reverts commit 8d26aa90458f82b952dcaa64e7c4afed9c862d68. The patch series that removed typedefs from the octeon driver was not actually built properly, and broke the build (it's hard to test-build this driver for some reason.) Remove them all at this point in time to make sure the build works properly. Link: https://lore.kernel.org/r/32e9ad3c-191e-4dd1-b1cc-07f7b93c3f28@roeck-us.net Reported-by: Guenter Roeck Cc: Oliver Crumrine Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon/octeon-stubs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h index 2cdbcbd8a97be..4470c985dc5d9 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -238,11 +238,11 @@ enum cvmx_pow_wait { CVMX_POW_NO_WAIT = 0, }; -enum cvmx_pko_lock { +typedef enum { CVMX_PKO_LOCK_NONE = 0, CVMX_PKO_LOCK_ATOMIC_TAG = 1, CVMX_PKO_LOCK_CMD_QUEUE = 2, -}; +} cvmx_pko_lock_t; typedef enum { CVMX_PKO_SUCCESS, @@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac } static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue, - enum cvmx_pko_lock use_locking) + cvmx_pko_lock_t use_locking) { } static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(uint64_t port, uint64_t queue, union cvmx_pko_command_word0 pko_command, - union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking) + union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking) { return 0; } -- 2.30.2