Commit 06bab96a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: octeon: remove typedef in enum cvmx_pko_status_t" 

This reverts commit 4fffe473.

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: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Oliver Crumrine <ozlinux@hotmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c312b8b3

drivers/staging/octeon/octeon-stubs.h

+3 −3
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ enum cvmx_pko_lock { 
	CVMX_PKO_LOCK_CMD_QUEUE = 2,

};



enum cvmx_pko_status {

typedef enum {

	CVMX_PKO_SUCCESS,

	CVMX_PKO_INVALID_PORT,

	CVMX_PKO_INVALID_QUEUE,
@@ -252,7 +252,7 @@ enum cvmx_pko_status { 
	CVMX_PKO_NO_MEMORY,

	CVMX_PKO_PORT_ALREADY_SETUP,

	CVMX_PKO_CMD_QUEUE_INIT_ERROR

};

} cvmx_pko_status_t;



enum cvmx_pow_tag_type {

	CVMX_POW_TAG_TYPE_ORDERED   = 0L,
@@ -1384,7 +1384,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue, 
						enum cvmx_pko_lock use_locking)

{ }



static inline enum cvmx_pko_status cvmx_pko_send_packet_finish(uint64_t port,

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)

{