From: Wambui Karuga <wambui.karugax@gmail.com>
To: outreachy-kernel@googlegroups.com
Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org,
Wambui Karuga <wambui.karugax@gmail.com>
Subject: [PATCH 4/5] staging: octeon: remove typedef declartion for cvmx_pko_command_word0_t
Date: Fri, 11 Oct 2019 09:02:41 +0300 [thread overview]
Message-ID: <2248b40bda9295263ba998c216fe1ac18a2324b4.1570773209.git.wambui.karugax@gmail.com> (raw)
In-Reply-To: <cover.1570773209.git.wambui.karugax@gmail.com>
Removes addition of new typedef declaration for
cvmx_pko_command_word0_t in drivers/staging/octeon/octeon-stubs.h.
Also replace previous instances with new union declaration.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
---
drivers/staging/octeon/ethernet-tx.c | 2 +-
drivers/staging/octeon/octeon-stubs.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 7ececfac0701..f88d8e6f5292 100644
--- 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_t 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 1725d54523de..06e6a0223416 100644
--- 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_t {
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_t pko_command,
union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking)
{
cvmx_pko_status_t ret = 0;
--
2.23.0
next prev parent reply other threads:[~2019-10-11 6:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 6:02 [PATCH 0/5] Remove declarations of new typedef in Wambui Karuga
2019-10-11 6:02 ` [PATCH 1/5] staging: octeon: remove typedef declaration for cvmx_wqe_t Wambui Karuga
2019-10-11 6:18 ` [Outreachy kernel] " Julia Lawall
2019-10-11 8:59 ` Wambui Karuga
2019-10-11 10:58 ` Dan Carpenter
2019-10-11 6:02 ` [PATCH 2/5] staging: octeon: remove typedef declaration for cvmx_helper_link_info_t Wambui Karuga
2019-10-11 9:02 ` Greg KH
2019-10-11 9:26 ` Wambui Karuga
2019-10-11 6:02 ` [PATCH 3/5] staging: octeon: remove typedef declaration for cvmx_fau_reg_32_t Wambui Karuga
2019-10-11 6:02 ` Wambui Karuga [this message]
2019-10-11 6:02 ` [PATCH 5/5] staging: octeon: remove typedef declaration for cvmx_fau_op_size_t Wambui Karuga
2019-10-11 9:01 ` [PATCH 0/5] Remove declarations of new typedef in Greg KH
2019-10-11 9:24 ` Wambui Karuga
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2248b40bda9295263ba998c216fe1ac18a2324b4.1570773209.git.wambui.karugax@gmail.com \
--to=wambui.karugax@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=outreachy-kernel@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).