Skip to content

Commit 4de2013

Browse files
committed
Revert "staging: octeon: remove typedef in struct cvmx_pko_lock_t"
This reverts commit 8d26aa9. 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 06bab96 commit 4de2013

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/staging/octeon/octeon-stubs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ enum cvmx_pow_wait {
238238
CVMX_POW_NO_WAIT = 0,
239239
};
240240

241-
enum cvmx_pko_lock {
241+
typedef enum {
242242
CVMX_PKO_LOCK_NONE = 0,
243243
CVMX_PKO_LOCK_ATOMIC_TAG = 1,
244244
CVMX_PKO_LOCK_CMD_QUEUE = 2,
245-
};
245+
} cvmx_pko_lock_t;
246246

247247
typedef enum {
248248
CVMX_PKO_SUCCESS,
@@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac
13811381
}
13821382

13831383
static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
1384-
enum cvmx_pko_lock use_locking)
1384+
cvmx_pko_lock_t use_locking)
13851385
{ }
13861386

13871387
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,
1389-
union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking)
1389+
union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking)
13901390
{
13911391
return 0;
13921392
}

0 commit comments

Comments
 (0)