staging: octeon: remove typedef declartion for cvmx_pko_command_word0

Removes addition of new typedef declaration for
cvmx_pko_command_word0.
Also replace previous instances with new union declaration.

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Link: https://lore.kernel.org/r/40bb26b250d7ba5b0d5199072e773be2fb0fed90.1570821661.git.wambui.karugax@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 5481e6bb330a4a2c49690feaaead27226183283d..5114273826ec55476c300d364cbde2449027b0ee 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -127,7 +127,7 @@ static void cvm_oct_free_tx_skbs(struct net_device *dev)
  */
 int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       cvmx_pko_command_word0_t pko_command;
+       union cvmx_pko_command_word0 pko_command;
        union cvmx_buf_ptr hw_buffer;
        u64 old_scratch;
        u64 old_scratch2;

diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h
index c328f0771985bca2c2f047e4de4a05899226d917..9711bf37971026228e67cf2f658b046ad6df96e5 100644 (file)
--- a/drivers/staging/octeon/octeon-stubs.h
+++ b/drivers/staging/octeon/octeon-stubs.h
@@ -1137,7 +1137,7 @@ union cvmx_npi_rsl_int_blocks {
        } cn50xx;
 };
 
-typedef union {
+union cvmx_pko_command_word0 {
        uint64_t u64;
        struct {
                uint64_t total_bytes:16;
@@ -1157,7 +1157,7 @@ typedef union {
                uint64_t size0:2;
                uint64_t size1:2;
        } s;
-} cvmx_pko_command_word0_t;
+};
 
 union cvmx_ciu_timx {
        uint64_t u64;
@@ -1384,7 +1384,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,
+               uint64_t queue, union cvmx_pko_command_word0 pko_command,
                union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking)
 {
        cvmx_pko_status_t ret = 0;