Skip to content

Commit 06bab96

Browse files
committed
Revert "staging: octeon: remove typedef in enum cvmx_pko_status_t"
This reverts commit 4fffe47. 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 c312b8b commit 06bab96

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/staging/octeon/octeon-stubs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ enum cvmx_pko_lock {
244244
CVMX_PKO_LOCK_CMD_QUEUE = 2,
245245
};
246246

247-
enum cvmx_pko_status {
247+
typedef enum {
248248
CVMX_PKO_SUCCESS,
249249
CVMX_PKO_INVALID_PORT,
250250
CVMX_PKO_INVALID_QUEUE,
251251
CVMX_PKO_INVALID_PRIORITY,
252252
CVMX_PKO_NO_MEMORY,
253253
CVMX_PKO_PORT_ALREADY_SETUP,
254254
CVMX_PKO_CMD_QUEUE_INIT_ERROR
255-
};
255+
} cvmx_pko_status_t;
256256

257257
enum cvmx_pow_tag_type {
258258
CVMX_POW_TAG_TYPE_ORDERED = 0L,
@@ -1384,7 +1384,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
13841384
enum cvmx_pko_lock use_locking)
13851385
{ }
13861386

1387-
static inline enum cvmx_pko_status cvmx_pko_send_packet_finish(uint64_t port,
1387+
static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(uint64_t port,
13881388
uint64_t queue, union cvmx_pko_command_word0 pko_command,
13891389
union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking)
13901390
{

0 commit comments

Comments
 (0)