From: Jonathan Bergh <bergh.jonathan@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Jonathan Bergh <bergh.jonathan@gmail.com>
Subject: [PATCH v3 2/7] staging: octeon: Fix up introduction of new typedef cvmx_helper_interface_mode_t in octeon
Date: Sat, 21 Oct 2023 12:12:33 +0200 [thread overview]
Message-ID: <20231021101238.81466-3-bergh.jonathan@gmail.com> (raw)
In-Reply-To: <20231021101238.81466-1-bergh.jonathan@gmail.com>
This patch removes the typedef for the following enum
cvmx_helper_interface_mode_t and then fixes up implementations that used
it.
Signed-off-by: Jonathan Bergh <bergh.jonathan@gmail.com>
---
Changelog:
v1 -> v2: Fix breaking change spread across multiple patches
v2 -> v3: Break changes up into individual patches for each removed
typedef
drivers/staging/octeon/ethernet.c | 2 +-
drivers/staging/octeon/octeon-stubs.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9eee28f2940c..023b107e077a 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -798,7 +798,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
num_interfaces = cvmx_helper_get_number_of_interfaces();
for (interface = 0; interface < num_interfaces; interface++) {
- cvmx_helper_interface_mode_t imode =
+ enum cvmx_helper_interface_mode imode =
cvmx_helper_interface_get_mode(interface);
int num_ports = cvmx_helper_ports_on_interface(interface);
int port;
diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h
index 9f269626b862..40c357c77679 100644
--- a/drivers/staging/octeon/octeon-stubs.h
+++ b/drivers/staging/octeon/octeon-stubs.h
@@ -220,7 +220,7 @@ enum cvmx_spi_mode {
CVMX_SPI_MODE_DUPLEX = 3
};
-typedef enum {
+enum cvmx_helper_interface_mode {
CVMX_HELPER_INTERFACE_MODE_DISABLED,
CVMX_HELPER_INTERFACE_MODE_RGMII,
CVMX_HELPER_INTERFACE_MODE_GMII,
@@ -231,7 +231,7 @@ typedef enum {
CVMX_HELPER_INTERFACE_MODE_PICMG,
CVMX_HELPER_INTERFACE_MODE_NPI,
CVMX_HELPER_INTERFACE_MODE_LOOP,
-} cvmx_helper_interface_mode_t;
+};
typedef enum {
CVMX_POW_WAIT = 1,
@@ -1265,7 +1265,7 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
cvmx_pko_port_status_t *status)
{ }
-static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int
+static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int
interface)
{
return 0;
--
2.40.1
next prev parent reply other threads:[~2023-10-21 10:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-21 10:12 [PATCH v3 0/7] staging: octeon: Fix warnings due to introduction of new typedefs Jonathan Bergh
2023-10-21 10:12 ` [PATCH v3 1/7] staging: octeon: Fix introduction of new enum typedef cvmx_spi_mode_t in octeon Jonathan Bergh
2023-10-21 10:12 ` Jonathan Bergh [this message]
2023-10-21 10:12 ` [PATCH v3 3/7] staging: octeon: Fix introduction of following new typedef cvmx_pow_wait_t " Jonathan Bergh
2023-10-21 10:12 ` [PATCH v3 4/7] staging: octeon: Fix up introduction of new typedef cvmx_pko_lock_t " Jonathan Bergh
2023-10-21 10:12 ` [PATCH v3 5/7] staging: octeon: Fix introduction of new typedef cvmx_pko_status_t " Jonathan Bergh
2023-10-21 10:12 ` [PATCH v3 6/7] staging: octeon: Fix introduction of new typedef cvmx_pip_port_status_t " Jonathan Bergh
2023-10-21 10:12 ` [PATCH v3 7/7] staging: octeon: Fix introduction of new typedef cvmx_pko_port_status_t in octeon driver Jonathan Bergh
2023-10-21 20:54 ` [PATCH v3 0/7] staging: octeon: Fix warnings due to introduction of new typedefs Greg KH
2023-10-23 14:41 ` Dan Carpenter
2023-10-26 20:02 ` Jonathan Bergh
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=20231021101238.81466-3-bergh.jonathan@gmail.com \
--to=bergh.jonathan@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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