Skip to content

Commit d8fecfe

Browse files
committed
Revert "staging: octeon: remove typedef in enum cvmx_pow_wait_t"
This reverts commit 28fae77. 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>
1 parent 4de2013 commit d8fecfe

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/staging/octeon/octeon-stubs.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ enum cvmx_helper_interface_mode {
233233
CVMX_HELPER_INTERFACE_MODE_LOOP,
234234
};
235235

236-
enum cvmx_pow_wait {
236+
typedef enum {
237237
CVMX_POW_WAIT = 1,
238238
CVMX_POW_NO_WAIT = 0,
239-
};
239+
} cvmx_pow_wait_t;
240240

241241
typedef enum {
242242
CVMX_PKO_LOCK_NONE = 0,
@@ -1342,11 +1342,11 @@ static inline unsigned int cvmx_get_core_num(void)
13421342
}
13431343

13441344
static inline void cvmx_pow_work_request_async_nocheck(int scr_addr,
1345-
enum cvmx_pow_wait wait)
1345+
cvmx_pow_wait_t wait)
13461346
{ }
13471347

13481348
static inline void cvmx_pow_work_request_async(int scr_addr,
1349-
enum cvmx_pow_wait wait)
1349+
cvmx_pow_wait_t wait)
13501350
{ }
13511351

13521352
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)
13561356
return wqe;
13571357
}
13581358

1359-
static inline struct cvmx_wqe *cvmx_pow_work_request_sync(enum cvmx_pow_wait wait)
1359+
static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait)
13601360
{
13611361
return (void *)(unsigned long)wait;
13621362
}

0 commit comments

Comments
 (0)