Fix instances where new typedefs were introduced
cover Fix instances where new typedefs were introduced
These patches cover (first patch) the declarations where the new typedefs were introduced (they are removed), and then the cleanup of the inline functions in the same file, and then the second patch cleans up the ethernet.c file where they were also used
Jonathan Bergh (2):
staging: octeon: Fix warnings due to introduction of new typedefs
staging: octeon: Fix remaining istances affected by the removal of
typedefs
drivers/staging/octeon/ethernet.c | 6 ++-- drivers/staging/octeon/octeon-stubs.h | 48 +++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
2.40.1
PATCH 1/2 staging: octeon: Fix warnings due to introduction of new typedefs
Removed typedefs for various structs and enums and then make the requisite changes in the inline functions defined later in the same file.
--- drivers/staging/octeon/octeon-stubs.h | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/staging/octeon/octeon-stubs.h +24 -24
@@ -213,14 +213,14 @@ enum cvmx_fau_op_size {CVMX_FAU_OP_SIZE_64 =3 }; -typedef enum { +enum cvmx_spi_mode {CVMX_SPI_MODE_UNKNOWN =0 ,CVMX_SPI_MODE_TX_HALFPLEX =1 ,CVMX_SPI_MODE_RX_HALFPLEX =2 ,CVMX_SPI_MODE_DUPLEX =3 -}cvmx_spi_mode_t ; +}; -typedef enum { +enum cvmx_helper_interface_mode {CVMX_HELPER_INTERFACE_MODE_DISABLED ,CVMX_HELPER_INTERFACE_MODE_RGMII ,CVMX_HELPER_INTERFACE_MODE_GMII ,
@@ -231,20 +231,20 @@ typedef enum {CVMX_HELPER_INTERFACE_MODE_PICMG ,CVMX_HELPER_INTERFACE_MODE_NPI , CVMX_HELPER_INTERFACE_MODE_LOOP, -} cvmx_helper_interface_mode_t; +}; -typedef enum { +enum cvmx_pow_wait {CVMX_POW_WAIT =1 ,CVMX_POW_NO_WAIT =0 , -}cvmx_pow_wait_t ; +}; -typedef enum { +enum cvmx_pko_lock {CVMX_PKO_LOCK_NONE =0 ,CVMX_PKO_LOCK_ATOMIC_TAG =1 ,CVMX_PKO_LOCK_CMD_QUEUE =2 , -}cvmx_pko_lock_t ; +}; -typedef enum { +enum cvmx_pko_status {CVMX_PKO_SUCCESS ,CVMX_PKO_INVALID_PORT , CVMX_PKO_INVALID_QUEUE,
@@ -252,7 +252,7 @@ typedef enum {CVMX_PKO_NO_MEMORY ,CVMX_PKO_PORT_ALREADY_SETUP ,CVMX_PKO_CMD_QUEUE_INIT_ERROR -} cvmx_pko_status_t; +};enum cvmx_pow_tag_type { CVMX_POW_TAG_TYPE_ORDERED = 0L,
@@ -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,14 +1258,14 @@ 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 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 ;
@@ -1342,11 +1342,11 @@ static inline unsigned int cvmx_get_core_num(void) }static inline void cvmx_pow_work_request_async_nocheck (int scr_addr, -cvmx_pow_wait_t wait) +enum cvmx_pow_wait wait) { }static inline void cvmx_pow_work_request_async (int scr_addr, -cvmx_pow_wait_t wait) +enum cvmx_pow_wait wait) { }static inline struct cvmx_wqe *cvmx_pow_work_response_async (int scr_addr)
@@ -1356,13 +1356,13 @@ static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr)return wqe; } -static inline struct cvmx_wqe *cvmx_pow_work_request_sync (cvmx_pow_wait_t wait) +static inline struct cvmx_wqe *cvmx_pow_work_request_sync (enum cvmx_pow_wait wait) {return (void *)(unsigned long )wait; }static inline int cvmx_spi_restart_interface (int interface, -cvmx_spi_mode_t mode,int timeout) +enum cvmx_spi_mode mode,int timeout) {return 0 ; }
@@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac }static inline void cvmx_pko_send_packet_prepare (uint64_t port,uint64_t queue, -cvmx_pko_lock_t use_locking) +enum cvmx_pko_lock use_locking) { } -static inline cvmx_pko_status_t cvmx_pko_send_packet_finish (uint64_t port, +static inline enum cvmx_pko_status cvmx_pko_send_packet_finish (uint64_t port,uint64_t queue,union cvmx_pko_command_word0 pko_command, -union cvmx_buf_ptr packet,cvmx_pko_lock_t use_locking) +union cvmx_buf_ptr packet,enum cvmx_pko_lock use_locking) {return 0 ; }
Signature · 1 line
2.40.1
Re: [PATCH 1/2] staging: octeon: Fix warnings due to introduction of new typedefs
Quoted 7 lines · Jonathan Bergh
Removed typedefs for various structs and enums and then make the requisite changes in the inline functions defined later in the same file.
Signed-off-by Jonathan Bergh <[email protected]>--- drivers/staging/octeon/octeon-stubs.h | 48 +++++++++++++--------------
These octeon stubs are just so that it can be compile tested on x86.
The real code is in arch/ somewhere. It's Cavium stuff. If you change this without changing the arch/ code you're going to break the actual user.
regards,
dan carpenter
PATCH 2/2 staging: octeon: Fix remaining instances affected by removal of typedefs
In reply to Jonathan BerghUpdate the remaining instances in ethernet.c file affected by removal of the typedefs from octeon-stubs.h
--- drivers/staging/octeon/ethernet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/octeon/ethernet.c +3 -3
@@ -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 ) {
@@ -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;
Signature · 1 line
2.40.1
Greg KH
maintainerRe: [PATCH 2/2] staging: octeon: Fix remaining instances affected by removal of typedefs
Quoted 2 lines · Jonathan Bergh
Update the remaining instances in
ethernet.cfile affected by removal of the typedefs fromocteon-stubs.h
You can not break the build in one patch, and then fix it up in a second one, sorry, that's not how kernel development works. Each patch needs to work properly on its own.
thanks,
greg k-h