Revert "staging: octeon: remove typedef in enum cvmx_pow_wait_t"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Oct 2023 08:54:13 +0000 (09:54 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Oct 2023 08:56:19 +0000 (09:56 +0100)
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>
drivers/staging/octeon/octeon-stubs.h

index 4470c985dc5d9bea392d22f9820703282c1409f2..0b0c609a771ce7888ed1550c68a5f8b10f9f328f 100644 (file)
@@ -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;
 }