diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-30 09:54:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-30 09:56:19 +0100 |
| commit | d8fecfe8f41edf6762256f9a888e9f906181a641 (patch) | |
| tree | bbc8c3cc36cd89c3f2441407d7b44259853f0d5d /drivers/staging | |
| parent | 4de20132b029c0fd894faf1fcb7c523243dc1cc1 (diff) | |
Revert "staging: octeon: remove typedef in enum cvmx_pow_wait_t"
This reverts commit 28fae776c69bdac005fa77a7e0daa64725d0f4f8.
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 <linux@roeck-us.net>
Cc: Oliver Crumrine <ozlinux@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/octeon/octeon-stubs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h index 4470c985dc5d..0b0c609a771c 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -233,10 +233,10 @@ enum cvmx_helper_interface_mode { CVMX_HELPER_INTERFACE_MODE_LOOP, }; -enum cvmx_pow_wait { +typedef enum { CVMX_POW_WAIT = 1, CVMX_POW_NO_WAIT = 0, -}; +} cvmx_pow_wait_t; typedef enum { CVMX_PKO_LOCK_NONE = 0, @@ -1342,11 +1342,11 @@ static inline unsigned int cvmx_get_core_num(void) } static inline void cvmx_pow_work_request_async_nocheck(int scr_addr, - enum cvmx_pow_wait wait) + cvmx_pow_wait_t wait) { } static inline void cvmx_pow_work_request_async(int scr_addr, - enum cvmx_pow_wait wait) + cvmx_pow_wait_t wait) { } static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr) @@ -1356,7 +1356,7 @@ static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr) return wqe; } -static inline struct cvmx_wqe *cvmx_pow_work_request_sync(enum cvmx_pow_wait wait) +static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait) { return (void *)(unsigned long)wait; } |