This patch removes the introduction of a new struct typedef
cvmx_pko_port_status_t in the octeon driver and then fixes the
implementations which used it.
Signed-off-by: Jonathan Bergh <bergh.jonathan@xxxxxxxxx>
---
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 8c48acab49e4..8e1f4b987a25 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -202,7 +202,7 @@ EXPORT_SYMBOL(cvm_oct_free_work);
static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
{
struct cvmx_pip_port_status rx_status;
- cvmx_pko_port_status_t tx_status;
+ struct cvmx_pko_port_status tx_status;
struct octeon_ethernet *priv = netdev_priv(dev);
if (priv->port < CVMX_PIP_NUM_INPUT_PORTS) {
diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h
index 33a0e1d5f961..cf7f77061eb9 100644
--- a/drivers/staging/octeon/octeon-stubs.h
+++ b/drivers/staging/octeon/octeon-stubs.h
@@ -409,11 +409,11 @@ struct cvmx_pip_port_status {
uint16_t inb_errors;
};
-typedef struct {
+struct cvmx_pko_port_status {
uint32_t packets;
uint64_t octets;
uint64_t doorbell;
-} cvmx_pko_port_status_t;
+};
union cvmx_pip_frm_len_chkx {
uint64_t u64;
@@ -1262,7 +1262,7 @@ static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear,
{ }
static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
- cvmx_pko_port_status_t *status)
+ struct cvmx_pko_port_status *status)
{ }
static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int
--
2.40.1
