mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
Revert "staging: octeon: remove typedef in struct cvmx_pko_lock_t"
This reverts commit 8d26aa9045.
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>
This commit is contained in:
parent
06bab96a6e
commit
4de20132b0
|
|
@ -238,11 +238,11 @@ enum cvmx_pow_wait {
|
|||
CVMX_POW_NO_WAIT = 0,
|
||||
};
|
||||
|
||||
enum cvmx_pko_lock {
|
||||
typedef enum {
|
||||
CVMX_PKO_LOCK_NONE = 0,
|
||||
CVMX_PKO_LOCK_ATOMIC_TAG = 1,
|
||||
CVMX_PKO_LOCK_CMD_QUEUE = 2,
|
||||
};
|
||||
} cvmx_pko_lock_t;
|
||||
|
||||
typedef enum {
|
||||
CVMX_PKO_SUCCESS,
|
||||
|
|
@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac
|
|||
}
|
||||
|
||||
static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
|
||||
enum cvmx_pko_lock use_locking)
|
||||
cvmx_pko_lock_t use_locking)
|
||||
{ }
|
||||
|
||||
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)
|
||||
union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user