diff options
| author | Oliver Crumrine <[email protected]> | 2023-08-28 11:39:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2023-09-17 09:49:50 +0200 |
| commit | b33a296d831189d8a8eedee360e889509b9c81e6 (patch) | |
| tree | 72ed67afd921f347c3fff5a3c4149a75c40d17af | |
| parent | 4fffe4733cfb08a4c08eca722a8eb819b842c043 (diff) | |
staging: octeon: remove typedef in structs cvmx_pip_port_status_t and cvmx_pko_port_status_t
Remove typedef in structs cvmx_pip_port_status_t and cvmx_pko_port_status_t,
and rename all instances to cvmx_pip_port_status, and cvmx_pko_port_status,
respectively
Signed-off-by: Oliver Crumrine <[email protected]>
Link: https://lore.kernel.org/r/PH7PR11MB76434462A6563C5FBDEE51A8BCE0A@PH7PR11MB7643.namprd11.prod.outlook.com
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 4 | ||||
| -rw-r--r-- | drivers/staging/octeon/octeon-stubs.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 023b107e077a..8e1f4b987a25 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -201,8 +201,8 @@ EXPORT_SYMBOL(cvm_oct_free_work); */ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev) { - cvmx_pip_port_status_t rx_status; - cvmx_pko_port_status_t tx_status; + struct cvmx_pip_port_status rx_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 b9852994882b..579c755cfdc0 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -384,7 +384,7 @@ union cvmx_ipd_sub_port_qos_cnt { } s; }; -typedef struct { +struct cvmx_pip_port_status { uint32_t dropped_octets; uint32_t dropped_packets; uint32_t pci_raw_packets; @@ -407,13 +407,13 @@ typedef struct { uint32_t inb_packets; uint64_t inb_octets; uint16_t inb_errors; -} cvmx_pip_port_status_t; +}; -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; @@ -1258,11 +1258,11 @@ static inline int octeon_is_simulation(void) } static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear, - cvmx_pip_port_status_t *status) + struct cvmx_pip_port_status *status) { } 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 |