From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: gregkh@linuxfoundation.org, ralf@linux-mips.org,
paulburton@kernel.org, linux@roeck-us.net,
dan.carpenter@oracle.com, willy@infradead.org
Cc: linux-mips@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH 5/6] MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0
Date: Wed, 5 Feb 2020 13:11:15 +1300 [thread overview]
Message-ID: <20200205001116.14096-6-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20200205001116.14096-1-chris.packham@alliedtelesis.co.nz>
Remove the typedef and update usage to use the union.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index 8002f9d3039d..6044ff471002 100644
--- 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 f033523c19f8..5b0b982a36f7 100644
--- 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)
--
2.25.0
next prev parent reply other threads:[~2020-02-05 0:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
2020-02-05 0:11 ` [PATCH 1/6] Revert "staging: octeon-usb: delete the octeon usb host controller driver" Chris Packham
2020-02-05 0:11 ` [PATCH 2/6] Revert "staging: octeon: delete driver" Chris Packham
2020-02-05 0:11 ` [PATCH 3/6] MIPS: octeon: remove typedef declaration for cvmx_wqe Chris Packham
2020-02-05 0:11 ` [PATCH 4/6] MIPS: octeon: remove typedef declaration for cvmx_helper_link_info Chris Packham
2020-02-05 0:11 ` Chris Packham [this message]
2020-02-05 0:11 ` [PATCH 6/6] Revert "staging/octeon: Mark Ethernet driver as BROKEN" Chris Packham
2020-02-12 21:52 ` [PATCH 0/6] Re-instate octeon staging drivers Greg KH
2020-03-04 1:48 ` YunQiang Su
2020-03-04 6:39 ` Greg KH
2020-03-04 10:25 ` YunQiang Su
2020-03-04 11:50 ` Greg KH
2020-03-04 19:47 ` Chris Packham
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=20200205001116.14096-6-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=paulburton@kernel.org \
--cc=ralf@linux-mips.org \
--cc=willy@infradead.org \
/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).