staging: octeon: remove typedef declartion for cvmx_pko_command_word0 (6cc5e1c7) · Commits · 戴 / test

drivers/staging/octeon/ethernet-tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;