leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0

Browse Source 
Remove the typedef and update usage to use the union.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200205001116.14096-6-chris.packham@alliedtelesis.co.nz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chris Packham
2020-02-05 13:11:15 +13:00
committed by Greg Kroah-Hartman
parent f7d2bdcb7e
commit 9da303533b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/cavium-octeon/executive/cvmx-helper.c
View File

@@ -782,7 +782,7 @@ static int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)
#define INTERFACE(port) (port >> 4) #define INTERFACE(port) (port >> 4)
#define INDEX(port) (port & 0xf) #define INDEX(port) (port & 0xf)
uint64_t *p64; uint64_t *p64;
cvmx_pko_command_word0_t pko_command; union cvmx_pko_command_word0 pko_command;
union cvmx_buf_ptr g_buffer, pkt_buffer; union cvmx_buf_ptr g_buffer, pkt_buffer;
struct cvmx_wqe *work; struct cvmx_wqe *work;
int size, num_segs = 0, wqe_pcnt, pkt_pcnt; int size, num_segs = 0, wqe_pcnt, pkt_pcnt;

8
arch/mips/include/asm/octeon/cvmx-pko.h
View File

@@ -169,7 +169,7 @@ typedef union {
/** /**
* Structure of the first packet output command word. * Structure of the first packet output command word.
*/ */
typedef union { union cvmx_pko_command_word0 {
uint64_t u64; uint64_t u64;
struct { struct {
#ifdef __BIG_ENDIAN_BITFIELD #ifdef __BIG_ENDIAN_BITFIELD
@@ -261,7 +261,7 @@ typedef union {
uint64_t size1:2; uint64_t size1:2;
#endif #endif
} s; } s;
} cvmx_pko_command_word0_t; };
/* CSR typedefs have been moved to cvmx-csr-*.h */ /* CSR typedefs have been moved to cvmx-csr-*.h */
@@ -419,7 +419,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
static inline cvmx_pko_status_t cvmx_pko_send_packet_finish( static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(
uint64_t port, uint64_t port,
uint64_t queue, uint64_t queue,
cvmx_pko_command_word0_t pko_command, union cvmx_pko_command_word0 pko_command,
union cvmx_buf_ptr packet, union cvmx_buf_ptr packet,
cvmx_pko_lock_t use_locking) cvmx_pko_lock_t use_locking)
{ {
@@ -462,7 +462,7 @@ static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(
static inline cvmx_pko_status_t cvmx_pko_send_packet_finish3( static inline cvmx_pko_status_t cvmx_pko_send_packet_finish3(
uint64_t port, uint64_t port,
uint64_t queue, uint64_t queue,
cvmx_pko_command_word0_t pko_command, union cvmx_pko_command_word0 pko_command,
union cvmx_buf_ptr packet, union cvmx_buf_ptr packet,
uint64_t addr, uint64_t addr,
cvmx_pko_lock_t use_locking) cvmx_pko_lock_t use_locking)