mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

staging: octeon: remove typedef declartion for cvmx_pko_command_word0

Browse source 
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>
This commit is contained in:
Wambui Karuga 2019-10-12 21:04:34 +03:00 committed by Greg Kroah-Hartman
parent 1691741fe3
commit 6cc5e1c700
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/octeon/ethernet-tx.c
View file

@ -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;

6
drivers/staging/octeon/octeon-stubs.h
View file

@ -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;