staging: octeon: clean up the octeon ethernet driver

PATCH In review Oliver Crumrine 3 participants 9 messages Aug 28, 2023 1 message not in the archive Staging

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Oliver Crumrine

author

2023-08-28 13:40 UTC #1 lore raw

PATCH v4 1/6 staging: octeon: clean up the octeon ethernet driver

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/octeon-stubs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/staging/octeon/octeon-stubs.h +3 -3

index 3e7b92cd2e35..9f269626b862 100644
@@ -213,12 +213,12 @@ 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 {
 	CVMX_HELPER_INTERFACE_MODE_DISABLED,

@@ -1362,7 +1362,7 @@ static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t 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;
 }

Signature · 1 line

2.39.3

Nam Cao

2023-08-28 14:23 UTC #2 lore raw

Quoted 2 lines · Oliver Crumrine

Make the octeon ethernet driver better adhere to the kernel coding standard

Try to be more specific with your description. For example, mention that the patch remove typedef cvmx_spi_mode_t because "...". Same thing for your title, it's way too generic.

Have a look at the accepted patches to see how commit messages should be written.

Best regards,
Nam

Nam Cao

2023-08-28 14:38 UTC #3 lore raw

In reply to Oliver Crumrine

Quoted 8 lines · Oliver Crumrine

Make the octeon ethernet driver better adhere to the kernel coding standard
Signed-off-by Oliver Crumrine <[email protected]>
---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

Don't give up! You will get it right eventually.

This is not important, but I prefer you revert the order of the change log. The changes compared to the last version is most relevant, so preferably they should be put on top.

Best regards,
Nam

Greg KH

maintainer

2023-08-28 14:45 UTC #4 lore raw

Quoted 10 lines · Nam Cao

Quoted 8 lines · Oliver Crumrine
Make the octeon ethernet driver better adhere to the kernel coding standard
Signed-off-by Oliver Crumrine <[email protected]>
---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

Quoted 5 lines

Don't give up! You will get it right eventually.
This is not important, but I prefer you revert the order of the change log. The changes compared to the last version is most relevant, so preferably they should be put on top.

Either way is fine, this isn't an issue.

What _is_ an issue is that all of these have the identical subject line, and the identical changelog text _yet_ they do different things.

Oliver, please read read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for a description of how to do properly.

thanks,

greg k-h

Oliver Crumrine

author

2023-08-28 13:40 UTC #5 lore raw

PATCH v4 2/6 staging: octeon: clean up the octeon ethernet driver

In reply to a message not in the archive

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/ethernet.c     | 2 +-
 drivers/staging/octeon/octeon-stubs.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

drivers/staging/octeon/ethernet.c +1 -1

index 9eee28f2940c..023b107e077a 100644
@@ -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;

drivers/staging/octeon/octeon-stubs.h +4 -4

index 9f269626b862..0b0c609a771c 100644
@@ -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,8 +1265,8 @@ 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
-								   interface)
+static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int
+								       interface)
 {
 	return 0;
 }

Signature · 1 line

2.39.3

Oliver Crumrine

author

2023-08-28 13:40 UTC #6 lore raw

PATCH v4 3/6 staging: octeon: clean up the octeon ethernet driver

In reply to a message not in the archive

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/octeon-stubs.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/staging/octeon/octeon-stubs.h +5 -5

index 0b0c609a771c..4470c985dc5d 100644
@@ -233,10 +233,10 @@ enum cvmx_helper_interface_mode {
 	CVMX_HELPER_INTERFACE_MODE_LOOP,
 };
 
-typedef enum {
+enum cvmx_pow_wait {
 	CVMX_POW_WAIT = 1,
 	CVMX_POW_NO_WAIT = 0,
-} cvmx_pow_wait_t;
+};
 
 typedef enum {
 	CVMX_PKO_LOCK_NONE = 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,7 +1356,7 @@ 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;
 }

Signature · 1 line

2.39.3

Oliver Crumrine

author

2023-08-28 13:40 UTC #7 lore raw

PATCH v4 4/6 staging: octeon: clean up the octeon ethernet driver

In reply to a message not in the archive

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/octeon-stubs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/staging/octeon/octeon-stubs.h +4 -4

index 4470c985dc5d..2cdbcbd8a97b 100644
@@ -238,11 +238,11 @@ enum cvmx_pow_wait {
 	CVMX_POW_NO_WAIT = 0,
 };
 
-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 {
 	CVMX_PKO_SUCCESS,

@@ -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,
 		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.39.3

Oliver Crumrine

author

2023-08-28 13:40 UTC #8 lore raw

PATCH v4 5/6 staging: octeon: clean up the octeon ethernet driver

In reply to a message not in the archive

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/octeon-stubs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/staging/octeon/octeon-stubs.h +3 -3

index 2cdbcbd8a97b..b9852994882b 100644
@@ -244,7 +244,7 @@ enum cvmx_pko_lock {
 	CVMX_PKO_LOCK_CMD_QUEUE = 2,
 };
 
-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,

@@ -1384,7 +1384,7 @@ 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,
+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)
 {

Signature · 1 line

2.39.3

Oliver Crumrine

author

2023-08-28 13:40 UTC #9 lore raw

PATCH v4 6/6 staging: octeon: clean up the octeon ethernet driver

In reply to a message not in the archive

Make the octeon ethernet driver better adhere to the kernel coding standard

Signed-off-by Oliver Crumrine <[email protected]>

---
v2: Actually send the patch set properly
v3: Fixed a bug where I forgot to change all instances of a struct
v4: Actually fix that bug (this is my first patch, give me a break)

 drivers/staging/octeon/ethernet.c     |  4 ++--
 drivers/staging/octeon/octeon-stubs.h | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

drivers/staging/octeon/ethernet.c +2 -2

index 023b107e077a..8e1f4b987a25 100644
@@ -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) {

drivers/staging/octeon/octeon-stubs.h +6 -6

index b9852994882b..579c755cfdc0 100644
@@ -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

Signature · 1 line

2.39.3