MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0

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>

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index 8002f9d3039d59c1602142778864491ab5236f91..6044ff47100225b2c456b71e5018866ac1ee6c13 100644 (file)
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -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;

diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index f033523c19f8a4a31395abfe7a6585d9a248edc6..5b0b982a36f7741152c832088a228081b652cfca 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -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)