Commit 9da30353 authored by Chris Packham's avatar Chris Packham Committed by Greg Kroah-Hartman
Browse files

MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0 



Remove the typedef and update usage to use the union.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200205001116.14096-6-chris.packham@alliedtelesis.co.nz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7d2bdcb

arch/mips/cavium-octeon/executive/cvmx-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int __cvmx_helper_errata_fix_ipd_ptr_alignment(void) 
#define INTERFACE(port) (port >> 4)

#define INDEX(port) (port & 0xf)

	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;

	struct cvmx_wqe *work;

	int size, num_segs = 0, wqe_pcnt, pkt_pcnt;

arch/mips/include/asm/octeon/cvmx-pko.h

+4 −4
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ typedef union { 
/**

 * Structure of the first packet output command word.

 */

typedef union {

union cvmx_pko_command_word0 {

	uint64_t u64;

	struct {

#ifdef __BIG_ENDIAN_BITFIELD
@@ -261,7 +261,7 @@ typedef union { 
	        uint64_t size1:2;

#endif

	} s;

} cvmx_pko_command_word0_t;

};



/* 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(

	uint64_t port,

	uint64_t queue,

	cvmx_pko_command_word0_t pko_command,

	union cvmx_pko_command_word0 pko_command,

	union cvmx_buf_ptr packet,

	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(

	uint64_t port,

	uint64_t queue,

	cvmx_pko_command_word0_t pko_command,

	union cvmx_pko_command_word0 pko_command,

	union cvmx_buf_ptr packet,

	uint64_t addr,

	cvmx_pko_lock_t use_locking)

CRA Git | Maintained and supported by SUSTech CRA and CCSE