On Fri, Apr 07, 2023 at 03:05:43PM +0200, Dalvin-Ehinoma Noah Aiguobas wrote:
> Fix checkpatch.pl warning for enums in drivers/staging/octeon/octeon-stubs.h:
> cvmx_helper_interface_mode_t,
> cvmx_spi_mode_t,
> cvmx_pow_wait_t,
> cvmx_pko_lock_t,
> cvmx_pko_status_t
>
> Change typedef cvmx_helper_interface_mode_t to
> enum cvmx_helper_interface_mode in ethernet.c
>
> Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <pharcodra@xxxxxxxxx>
> ---
> drivers/staging/octeon/ethernet.c | 2 +-
> drivers/staging/octeon/octeon-stubs.h | 50 +++++++++++++++------------
> 2 files changed, 29 insertions(+), 23 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 3e7b92cd2e35..3d613dc725e8 100644
> --- a/drivers/staging/octeon/octeon-stubs.h
> +++ b/drivers/staging/octeon/octeon-stubs.h
> @@ -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,
> @@ -1257,15 +1257,17 @@ static inline int octeon_is_simulation(void)
> return 1;
> }
>
> -static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear,
> +static inline void cvmx_pip_get_port_status(uint64_t port_num,
> + uint64_t clear,
> cvmx_pip_port_status_t *status)
> { }
>
> -static inline void cvmx_pko_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)
> { }
>
> -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 +1344,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 +1358,14 @@ 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;
> }
> @@ -1380,13 +1383,16 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac
> return r;
> }
>
> -static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
> - cvmx_pko_lock_t use_locking)
> +static inline void cvmx_pko_send_packet_prepare(uint64_t port,
> + uint64_t queue,
> + enum cvmx_pko_lock use_locking)
> { }
>
> -static inline cvmx_pko_status_t 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)
> +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,
> + enum cvmx_pko_lock use_locking)
This introduces a new checkpatch WARNING -
WARNING: line length of 101 exceeds 100 columns
#158: FILE: drivers/staging/octeon/octeon-stubs.h:1395:
What happens if you leave the alignment as is, and only make the 'enum'
related changes?
You can send another patch in the future to address the alignment
CHECK's. That follows the one type of change per patch guideline.
Alison
> {
> return 0;
> }
> --
> 2.25.1
>
