[PATCH v4 00/19] Remove repeated words in comments and messages

[PATCH v4 00/19] Remove repeated words in comments and messages

[Stephen Hemminger]

This is a cleanup of comments and messages. Done by an ugly
pcregrep across sources and skipping lots of false positives

The idea is based of what some maintainers have been doing in netdev.

Series-acked-by: Bruce Richardson <bruce.richardson@intel.com> 

v4 - rebase and skip fixing common/sfc_efx/base

Stephen Hemminger (19):
  ethdev: reword dev_info_get description.
  remove repeated word 'to'
  remove repeated word 'is'
  remove repeated word 'same'
  remove repeated word 'on'
  remove repeated word 'in'
  remove repeated word 'this'
  remove repeated word 'only'
  remove repeated word 'worker'
  remove repeated word 'or'
  remove repeated word 'table'
  remove repeated word 'that'
  remove repeated word 'override'
  remove repeated word 'groups'
  remove repeated word 'page'
  remove repeated word 'individual'
  remove repeated word 'expected'
  remove repeated word 'be'
  remove repeated word 'all'

 app/test/test_ipsec.c                       |  2 +-
 app/test/test_resource.c                    |  2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c |  4 +--
 drivers/event/sw/sw_evdev.c                 |  2 +-
 drivers/net/bnx2x/bnx2x.c                   |  2 +-
 drivers/net/bnx2x/ecore_fw_defs.h           |  2 +-
 drivers/net/bnx2x/ecore_sp.h                |  2 +-
 drivers/net/bonding/rte_eth_bond_8023ad.h   |  2 +-
 drivers/net/cxgbe/cxgbe_filter.h            |  2 +-
 drivers/net/cxgbe/sge.c                     |  2 +-
 drivers/net/hns3/hns3_ethdev.c              |  2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c             |  2 +-
 drivers/net/mlx5/mlx5_flow.c                |  2 +-
 drivers/net/mvneta/mvneta_ethdev.c          |  2 +-
 drivers/net/mvpp2/mrvl_ethdev.c             |  2 +-
 drivers/net/nfp/nfp_ctrl.h                  |  2 +-
 drivers/net/pcap/pcap_ethdev.c              |  2 +-
 drivers/net/qede/qede_filter.c              |  4 +--
 drivers/net/sfc/sfc_ef10_tx.c               |  2 +-
 drivers/net/sfc/sfc_tso.c                   |  2 +-
 examples/vm_power_manager/channel_monitor.h |  2 +-
 examples/vm_power_manager/oob_monitor.h     |  2 +-
 lib/bpf/rte_bpf_ethdev.h                    |  2 +-
 lib/distributor/rte_distributor.c           |  2 +-
 lib/ethdev/rte_ethdev.h                     | 32 +++------------------
 lib/mbuf/rte_mbuf_core.h                    |  2 +-
 lib/net/rte_ether.h                         |  2 +-
 lib/pipeline/rte_swx_ctl.c                  |  2 +-
 lib/power/guest_channel.c                   |  2 +-
 lib/ring/rte_ring.c                         |  3 +-
 30 files changed, 36 insertions(+), 59 deletions(-)

-- 
2.39.1

[PATCH v4 01/19] ethdev: reword dev_info_get description.

[Stephen Hemminger]

The original comment was redundant and had duplicate word 'of'.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/ethdev/rte_ethdev.h | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 049641d57c66..14b8fa8402f1 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -3275,34 +3275,10 @@ int rte_eth_macaddrs_get(uint16_t port_id, struct rte_ether_addr *ma,
 /**
  * Retrieve the contextual information of an Ethernet device.
  *
- * As part of this function, a number of of fields in dev_info will be
- * initialized as follows:
- *
- * rx_desc_lim = lim
- * tx_desc_lim = lim
- *
- * Where lim is defined within the rte_eth_dev_info_get as
- *
- *  const struct rte_eth_desc_lim lim = {
- *      .nb_max = UINT16_MAX,
- *      .nb_min = 0,
- *      .nb_align = 1,
- *	.nb_seg_max = UINT16_MAX,
- *	.nb_mtu_seg_max = UINT16_MAX,
- *  };
- *
- * device = dev->device
- * min_mtu = RTE_ETHER_MIN_LEN - RTE_ETHER_HDR_LEN - RTE_ETHER_CRC_LEN
- * max_mtu = UINT16_MAX
- *
- * The following fields will be populated if support for dev_infos_get()
- * exists for the device and the rte_eth_dev 'dev' has been populated
- * successfully with a call to it:
- *
- * driver_name = rte_driver_name(rte_dev_driver(dev->device));
- * nb_rx_queues = dev->data->nb_rx_queues
- * nb_tx_queues = dev->data->nb_tx_queues
- * dev_flags = &dev->data->dev_flags
+ * This function returns the Ethernet device information based
+ * on the values stored internally in the device specific data.
+ * For example: number of queues, descriptor limits, device
+ * capabilities and offload flags.
  *
  * @param port_id
  *   The port identifier of the Ethernet device.
-- 
2.39.1

[PATCH v4 02/19] remove repeated word 'to'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/test/test_resource.c   | 2 +-
 lib/pipeline/rte_swx_ctl.c | 2 +-
 lib/power/guest_channel.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/test/test_resource.c b/app/test/test_resource.c
index 8f41e3babdc5..05c27db203cc 100644
--- a/app/test/test_resource.c
+++ b/app/test/test_resource.c
@@ -45,7 +45,7 @@ static int test_resource_c(void)
 			r->name);
 
 	TEST_ASSERT_SUCCESS(resource_fwrite_file(r, "test_resource.c"),
-			"Failed to to write file %s", r->name);
+			"Failed to write file %s", r->name);
 
 	f = fopen("test_resource.c", "r");
 	TEST_ASSERT_NOT_NULL(f,
diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index f7f49d7cebad..857770d297a4 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -1683,7 +1683,7 @@ rte_swx_ctl_pipeline_table_entry_delete(struct rte_swx_ctl_pipeline *ctl,
 	CHECK(!table_entry_check(ctl, table_id, entry, 1, 0), EINVAL);
 
 	/* The entry is found in the table->entries list:
-	 * - Move the existing entry from the table->entries list to to the
+	 * - Move the existing entry from the table->entries list to the
 	 *   table->pending_delete list.
 	 */
 	existing_entry = table_entries_find(table, entry);
diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
index 969a9e5aaa06..7b2ae0b6506f 100644
--- a/lib/power/guest_channel.c
+++ b/lib/power/guest_channel.c
@@ -74,7 +74,7 @@ guest_channel_host_connect(const char *path, unsigned int lcore_id)
 			fd_path, lcore_id);
 	fd = open(fd_path, O_RDWR);
 	if (fd < 0) {
-		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to to connect to '%s' with error "
+		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to connect to '%s' with error "
 				"%s\n", fd_path, strerror(errno));
 		return -1;
 	}
-- 
2.39.1

[PATCH v4 03/19] remove repeated word 'is'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/net/rte_ether.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index bf8a55ba06ca..b35c72c7b0e0 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -350,7 +350,7 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
  *   The packet mbuf.
  * @return
  *   - 0: On success
- *   -EPERM: mbuf is is shared overwriting would be unsafe
+ *   -EPERM: mbuf is shared overwriting would be unsafe
  *   -ENOSPC: not enough headroom in mbuf
  */
 static inline int rte_vlan_insert(struct rte_mbuf **m)
-- 
2.39.1

[PATCH v4 04/19] remove repeated word 'same'

[Stephen Hemminger]

The word 'same' is duplicated in comment.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Liron Himi <lironh@marvell.com>
---
 drivers/net/mvneta/mvneta_ethdev.c | 2 +-
 drivers/net/mvpp2/mrvl_ethdev.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index c4355a3f64d4..d7953ac7cbac 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -345,7 +345,7 @@ mvneta_dev_start(struct rte_eth_dev *dev)
 	mvneta_stats_reset(dev);
 
 	/*
-	 * In case there are some some stale uc/mc mac addresses flush them
+	 * In case there are some stale uc/mc mac addresses flush them
 	 * here. It cannot be done during mvneta_dev_close() as port information
 	 * is already gone at that point (due to neta_ppio_deinit() in
 	 * mvneta_dev_stop()).
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 8fd321128322..89c83f1c1f82 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -853,7 +853,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
 	}
 
 	/*
-	 * In case there are some some stale uc/mc mac addresses flush them
+	 * In case there are some stale uc/mc mac addresses flush them
 	 * here. It cannot be done during mrvl_dev_close() as port information
 	 * is already gone at that point (due to pp2_ppio_deinit() in
 	 * mrvl_dev_stop()).
-- 
2.39.1

[PATCH v4 05/19] remove repeated word 'on'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/bonding/rte_eth_bond_8023ad.h   | 2 +-
 examples/vm_power_manager/channel_monitor.h | 2 +-
 examples/vm_power_manager/oob_monitor.h     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
index 7eb392f8c8a1..7ad8d6d00bd5 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
@@ -271,7 +271,7 @@ rte_eth_bond_8023ad_ext_slowtx(uint16_t port_id, uint16_t slave_id,
 		struct rte_mbuf *lacp_pkt);
 
 /**
- * Enable dedicated hw queues for 802.3ad control plane traffic on on slaves
+ * Enable dedicated hw queues for 802.3ad control plane traffic on slaves
  *
  * This function creates an additional tx and rx queue on each slave for
  * dedicated 802.3ad control plane traffic . A flow filtering rule is
diff --git a/examples/vm_power_manager/channel_monitor.h b/examples/vm_power_manager/channel_monitor.h
index 2b38c554b5cd..ab69524af52c 100644
--- a/examples/vm_power_manager/channel_monitor.h
+++ b/examples/vm_power_manager/channel_monitor.h
@@ -41,7 +41,7 @@ extern "C" {
 int channel_monitor_init(void);
 
 /**
- * Run the channel monitor, loops forever on on epoll_wait.
+ * Run the channel monitor, loops forever on epoll_wait.
  *
  *
  * @return
diff --git a/examples/vm_power_manager/oob_monitor.h b/examples/vm_power_manager/oob_monitor.h
index b96e08df782c..2389c1151956 100644
--- a/examples/vm_power_manager/oob_monitor.h
+++ b/examples/vm_power_manager/oob_monitor.h
@@ -20,7 +20,7 @@ extern "C" {
 int branch_monitor_init(void);
 
 /**
- * Run the OOB branch monitor, loops forever on on epoll_wait.
+ * Run the OOB branch monitor, loops forever on epoll_wait.
  *
  *
  * @return
-- 
2.39.1

[PATCH v4 06/19] remove repeated word 'in'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/event/sw/sw_evdev.c    | 2 +-
 drivers/net/hns3/hns3_ethdev.c | 2 +-
 drivers/net/mlx5/mlx5_flow.c   | 2 +-
 drivers/net/sfc/sfc_ef10_tx.c  | 2 +-
 drivers/net/sfc/sfc_tso.c      | 2 +-
 lib/mbuf/rte_mbuf_core.h       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 3531821dd43a..cfd659d7748e 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -245,7 +245,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
 	if (qid->type == RTE_SCHED_TYPE_ORDERED) {
 		uint32_t window_size;
 
-		/* rte_ring and window_size_mask require require window_size to
+		/* rte_ring and window_size_mask require window_size to
 		 * be a power-of-2.
 		 */
 		window_size = rte_align32pow2(
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 6babf67fcec2..36896f898955 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3845,7 +3845,7 @@ hns3_dev_promiscuous_enable(struct rte_eth_dev *dev)
 
 	/*
 	 * When promiscuous mode was enabled, disable the vlan filter to let
-	 * all packets coming in in the receiving direction.
+	 * all packets coming in the receiving direction.
 	 */
 	offloads = dev->data->dev_conf.rxmode.offloads;
 	if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_FILTER) {
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index a6a426caf781..f55f24ad692a 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -5039,7 +5039,7 @@ flow_mreg_del_default_copy_action(struct rte_eth_dev *dev)
 }
 
 /**
- * Add the default copy action in in RX_CP_TBL.
+ * Add the default copy action in RX_CP_TBL.
  *
  * This functions is called in the mlx5_dev_start(). No thread safe
  * is guaranteed.
diff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c
index 5403a60707d1..116229382b68 100644
--- a/drivers/net/sfc/sfc_ef10_tx.c
+++ b/drivers/net/sfc/sfc_ef10_tx.c
@@ -503,7 +503,7 @@ sfc_ef10_xmit_tso_pkt(struct sfc_ef10_txq * const txq, struct rte_mbuf *m_seg,
 
 	/*
 	 * Tx prepare has debug-only checks that offload flags are correctly
-	 * filled in in TSO mbuf. Use zero IPID if there is no IPv4 flag.
+	 * filled in TSO mbuf. Use zero IPID if there is no IPv4 flag.
 	 * If the packet is still IPv4, HW will simply start from zero IPID.
 	 */
 	if (first_m_seg->ol_flags & RTE_MBUF_F_TX_IPV4)
diff --git a/drivers/net/sfc/sfc_tso.c b/drivers/net/sfc/sfc_tso.c
index 927e351a6ed4..a0827d1c0dd6 100644
--- a/drivers/net/sfc/sfc_tso.c
+++ b/drivers/net/sfc/sfc_tso.c
@@ -149,7 +149,7 @@ sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
 
 	/*
 	 * Handle IP header. Tx prepare has debug-only checks that offload flags
-	 * are correctly filled in in TSO mbuf. Use zero IPID if there is no
+	 * are correctly filled in TSO mbuf. Use zero IPID if there is no
 	 * IPv4 flag. If the packet is still IPv4, HW will simply start from
 	 * zero IPID.
 	 */
diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
index a30e1e0eaf87..93d66c63e626 100644
--- a/lib/mbuf/rte_mbuf_core.h
+++ b/lib/mbuf/rte_mbuf_core.h
@@ -41,7 +41,7 @@ extern "C" {
 
 /**
  * The RX packet is a 802.1q VLAN packet, and the tci has been
- * saved in in mbuf->vlan_tci.
+ * saved in mbuf->vlan_tci.
  * If the flag RTE_MBUF_F_RX_VLAN_STRIPPED is also present, the VLAN
  * header has been stripped from mbuf data, else it is still
  * present.
-- 
2.39.1

[PATCH v4 07/19] remove repeated word 'this'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/ring/rte_ring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index cddaf6b2876f..8ed455043dee 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -280,7 +280,8 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
 
 	/* reserve a memory zone for this ring. If we can't get rte_config or
 	 * we are secondary process, the memzone_reserve function will set
-	 * rte_errno for us appropriately - hence no check in this this function */
+	 * rte_errno for us appropriately - hence no check in this function
+	 */
 	mz = rte_memzone_reserve_aligned(mz_name, ring_size, socket_id,
 					 mz_flags, __alignof__(*r));
 	if (mz != NULL) {
-- 
2.39.1

[PATCH v4 08/19] remove repeated word 'only'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rasesh Mody <rmody@marvell.com>
---
 drivers/net/bnx2x/bnx2x.c      | 2 +-
 drivers/net/pcap/pcap_ethdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 74e3018eab6f..29c16bb207c7 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -5929,7 +5929,7 @@ static uint8_t bnx2x_trylock_hw_lock(struct bnx2x_softc *sc, uint32_t resource)
 
 /*
  * Get the recovery leader resource id according to the engine this function
- * belongs to. Currently only only 2 engines is supported.
+ * belongs to. Currently only 2 engines are supported.
  */
 static int bnx2x_get_leader_lock_resource(struct bnx2x_softc *sc)
 {
diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
index 5780f704b6dd..bfec0850456f 100644
--- a/drivers/net/pcap/pcap_ethdev.c
+++ b/drivers/net/pcap/pcap_ethdev.c
@@ -1337,7 +1337,7 @@ eth_from_pcaps(struct rte_vdev_device *vdev,
 		internals->if_index =
 			osdep_iface_index_get(rx_queues->queue[0].name);
 
-		/* phy_mac arg is applied only only if "iface" devarg is provided */
+		/* phy_mac arg is applied only if "iface" devarg is provided */
 		if (rx_queues->phy_mac) {
 			if (eth_pcap_update_mac(rx_queues->queue[0].name,
 					eth_dev, vdev->device.numa_node) == 0)
-- 
2.39.1

[PATCH v4 09/19] remove repeated word 'worker'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/distributor/rte_distributor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
index 3969b2ea7e8a..c1a721dd821d 100644
--- a/lib/distributor/rte_distributor.c
+++ b/lib/distributor/rte_distributor.c
@@ -576,7 +576,7 @@ rte_distributor_process(struct rte_distributor *d,
 					}
 				}
 
-				/* Add to current worker worker */
+				/* Add to current worker */
 				unsigned int idx = bl->count++;
 
 				bl->tags[idx] = new_tag;
-- 
2.39.1

[PATCH v4 10/19] remove repeated word 'or'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/cxgbe/sge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index 5b13cb5c947e..e9d45f24c419 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -65,7 +65,7 @@ static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,
  * for DMA, but this is of course never sent to the hardware and is only used
  * to prevent double unmappings.  All of the above requires that the Free List
  * Buffers which we allocate have the bottom 5 bits free (0) -- i.e. are
- * 32-byte or or a power of 2 greater in alignment.  Since the SGE's minimal
+ * 32-byte or a power of 2 greater in alignment.  Since the SGE's minimal
  * Free List Buffer alignment is 32 bytes, this works out for us ...
  */
 enum {
-- 
2.39.1

[PATCH v4 11/19] remove repeated word 'table'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ixgbe/ixgbe_ipsec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c
index 0c75fd36da20..d3313085560d 100644
--- a/drivers/net/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ixgbe/ixgbe_ipsec.c
@@ -310,7 +310,7 @@ ixgbe_crypto_remove_sa(struct rte_eth_dev *dev,
 			return -1;
 		}
 
-		/* Disable and clear Rx SPI and key table table entries*/
+		/* Disable and clear Rx SPI and key table entries*/
 		reg_val = IPSRXIDX_WRITE | IPSRXIDX_TABLE_SPI | (sa_index << 3);
 		IXGBE_WRITE_REG(hw, IXGBE_IPSRXSPI, 0);
 		IXGBE_WRITE_REG(hw, IXGBE_IPSRXIPIDX, 0);
-- 
2.39.1

[PATCH v4 12/19] remove repeated word 'that'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_ctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h
index 1069ff948555..2269925b74cf 100644
--- a/drivers/net/nfp/nfp_ctrl.h
+++ b/drivers/net/nfp/nfp_ctrl.h
@@ -196,7 +196,7 @@
  * Reuse spare address to contain the offset from the start of
  * the host buffer where the first byte of the received frame
  * will land.  Any metadata will come prior to that offset.  If the
- * value in this field is 0, it means that that the metadata will
+ * value in this field is 0, it means that the metadata will
  * always land starting at the first byte of the host buffer and
  * packet data will immediately follow the metadata.  As always,
  * the RX descriptor indicates the presence or absence of metadata
-- 
2.39.1

[PATCH v4 13/19] remove repeated word 'override'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index c25e40030bc5..392bf74856ff 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -191,7 +191,7 @@ build_proto_compound_sg_fd(dpaa2_sec_session *sess,
 	if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) {
 		uint32_t hfn_ovd = *(uint32_t *)((uint8_t *)op +
 					sess->pdcp.hfn_ovd_offset);
-		/*enable HFN override override */
+		/* enable HFN override */
 		DPAA2_SET_FLE_INTERNAL_JD(ip_fle, hfn_ovd);
 		DPAA2_SET_FLE_INTERNAL_JD(op_fle, hfn_ovd);
 		DPAA2_SET_FD_INTERNAL_JD(fd, hfn_ovd);
@@ -267,7 +267,7 @@ build_proto_compound_fd(dpaa2_sec_session *sess,
 	if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) {
 		uint32_t hfn_ovd = *(uint32_t *)((uint8_t *)op +
 					sess->pdcp.hfn_ovd_offset);
-		/*enable HFN override override */
+		/* enable HFN override */
 		DPAA2_SET_FLE_INTERNAL_JD(ip_fle, hfn_ovd);
 		DPAA2_SET_FLE_INTERNAL_JD(op_fle, hfn_ovd);
 		DPAA2_SET_FD_INTERNAL_JD(fd, hfn_ovd);
-- 
2.39.1

[PATCH v4 14/19] remove repeated word 'groups'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/test/test_ipsec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index cf71f99b964f..c2a52ec30527 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -943,7 +943,7 @@ crypto_ipsec_4grp(uint32_t pkt_num)
 {
 	uint32_t sa_ind;
 
-	/* group packets in 4 different size groups groups, 2 per SA */
+	/* group packets in 4 different size groups, 2 per SA */
 	if (pkt_num < PKT_4)
 		sa_ind = 0;
 	else if (pkt_num < PKT_12)
-- 
2.39.1

[PATCH v4 15/19] remove repeated word 'page'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/bnx2x/ecore_fw_defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnx2x/ecore_fw_defs.h b/drivers/net/bnx2x/ecore_fw_defs.h
index 6fc1fce7e29c..ab1abf6b34b3 100644
--- a/drivers/net/bnx2x/ecore_fw_defs.h
+++ b/drivers/net/bnx2x/ecore_fw_defs.h
@@ -341,7 +341,7 @@
 #define TOE_STATE (TOE_CONNECTION_TYPE << PROTOCOL_STATE_BIT_OFFSET)
 #define RDMA_STATE (RDMA_CONNECTION_TYPE << PROTOCOL_STATE_BIT_OFFSET)
 
-/* microcode fixed page page size 4K (chains and ring segments) */
+/* microcode fixed page size 4K (chains and ring segments) */
 #define MC_PAGE_SIZE 4096
 
 /* Number of indices per slow-path SB */
-- 
2.39.1

[PATCH v4 16/19] remove repeated word 'individual'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/cxgbe/cxgbe_filter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/cxgbe/cxgbe_filter.h b/drivers/net/cxgbe/cxgbe_filter.h
index 46ebf833381e..6e099a5c1cfc 100644
--- a/drivers/net/cxgbe/cxgbe_filter.h
+++ b/drivers/net/cxgbe/cxgbe_filter.h
@@ -28,7 +28,7 @@
  * (value, mask) tuples.  The associated ingress packet field matches the
  * tuple when ((field & mask) == value).  (Thus a wildcard "don't care" field
  * rule can be constructed by specifying a tuple of (0, 0).)  A filter rule
- * matches an ingress packet when all of the individual individual field
+ * matches an ingress packet when all of the individual field
  * matching rules are true.
  *
  * Partial field masks are always valid, however, while it may be easy to
-- 
2.39.1

[PATCH v4 17/19] remove repeated word 'expected'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/bpf/rte_bpf_ethdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bpf/rte_bpf_ethdev.h b/lib/bpf/rte_bpf_ethdev.h
index 135062c9e13c..1cca2e6c95a2 100644
--- a/lib/bpf/rte_bpf_ethdev.h
+++ b/lib/bpf/rte_bpf_ethdev.h
@@ -99,7 +99,7 @@ rte_bpf_eth_rx_elf_load(uint16_t port, uint16_t queue,
  * @param prm
  *  Parameters used to create and initialise the BPF execution context.
  * @param flags
- *  Flags that define expected expected behavior of the loaded filter
+ *  Flags that define expected behavior of the loaded filter
  *  (i.e. jited/non-jited version to use).
  * @return
  *   Zero on successful completion or negative error code otherwise.
-- 
2.39.1

[PATCH v4 18/19] remove repeated word 'be'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Devendra Singh Rawat <dsinghrawat@marvell.com>
Acked-by: Rasesh Mody <rmody@marvell.com>
---
 drivers/net/qede/qede_filter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c
index c5945451e876..e547b24a73bc 100644
--- a/drivers/net/qede/qede_filter.c
+++ b/drivers/net/qede/qede_filter.c
@@ -535,7 +535,7 @@ qede_udp_dst_port_del(struct rte_eth_dev *eth_dev,
 
 		qdev->vxlan.udp_port = udp_port;
 		/* If the request is to delete UDP port and if the number of
-		 * VXLAN filters have reached 0 then VxLAN offload can be be
+		 * VXLAN filters have reached 0 then VxLAN offload can be
 		 * disabled.
 		 */
 		if (qdev->vxlan.enable && qdev->vxlan.num_filters == 0)
@@ -564,7 +564,7 @@ qede_udp_dst_port_del(struct rte_eth_dev *eth_dev,
 
 		qdev->vxlan.udp_port = udp_port;
 		/* If the request is to delete UDP port and if the number of
-		 * GENEVE filters have reached 0 then GENEVE offload can be be
+		 * GENEVE filters have reached 0 then GENEVE offload can be
 		 * disabled.
 		 */
 		if (qdev->geneve.enable && qdev->geneve.num_filters == 0)
-- 
2.39.1

[PATCH v4 19/19] remove repeated word 'all'

[Stephen Hemminger]

Found by doing duplicate word scan.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/bnx2x/ecore_sp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnx2x/ecore_sp.h b/drivers/net/bnx2x/ecore_sp.h
index 1f4d5a3ebe29..c0b4d431c879 100644
--- a/drivers/net/bnx2x/ecore_sp.h
+++ b/drivers/net/bnx2x/ecore_sp.h
@@ -787,7 +787,7 @@ struct ecore_vlan_mac_obj {
 	/**
 	*  Delete all configured elements having the given
 	*  vlan_mac_flags specification. Assumes no pending for
-	*  execution commands. Will schedule all all currently
+	*  execution commands. Will schedule all currently
 	*  configured MACs/VLANs/VLAN-MACs matching the vlan_mac_flags
 	*  specification for deletion and will use the given
 	*  ramrod_flags for the last DEL operation.
-- 
2.39.1

RE: [PATCH v4 02/19] remove repeated word 'to'

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Wednesday, February 22, 2023 4:25 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Dumitrescu, Cristian
> <cristian.dumitrescu@intel.com>; Hunt, David <david.hunt@intel.com>
> Subject: [PATCH v4 02/19] remove repeated word 'to'
> 
> Found by doing duplicate word scan.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  app/test/test_resource.c   | 2 +-
>  lib/pipeline/rte_swx_ctl.c | 2 +-
>  lib/power/guest_channel.c  | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/app/test/test_resource.c b/app/test/test_resource.c
> index 8f41e3babdc5..05c27db203cc 100644
> --- a/app/test/test_resource.c
> +++ b/app/test/test_resource.c
> @@ -45,7 +45,7 @@ static int test_resource_c(void)
>  			r->name);
> 
>  	TEST_ASSERT_SUCCESS(resource_fwrite_file(r, "test_resource.c"),
> -			"Failed to to write file %s", r->name);
> +			"Failed to write file %s", r->name);
> 
>  	f = fopen("test_resource.c", "r");
>  	TEST_ASSERT_NOT_NULL(f,
> diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
> index f7f49d7cebad..857770d297a4 100644
> --- a/lib/pipeline/rte_swx_ctl.c
> +++ b/lib/pipeline/rte_swx_ctl.c
> @@ -1683,7 +1683,7 @@ rte_swx_ctl_pipeline_table_entry_delete(struct
> rte_swx_ctl_pipeline *ctl,
>  	CHECK(!table_entry_check(ctl, table_id, entry, 1, 0), EINVAL);
> 
>  	/* The entry is found in the table->entries list:
> -	 * - Move the existing entry from the table->entries list to to the
> +	 * - Move the existing entry from the table->entries list to the
>  	 *   table->pending_delete list.
>  	 */
>  	existing_entry = table_entries_find(table, entry);
> diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
> index 969a9e5aaa06..7b2ae0b6506f 100644
> --- a/lib/power/guest_channel.c
> +++ b/lib/power/guest_channel.c
> @@ -74,7 +74,7 @@ guest_channel_host_connect(const char *path, unsigned
> int lcore_id)
>  			fd_path, lcore_id);
>  	fd = open(fd_path, O_RDWR);
>  	if (fd < 0) {
> -		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to to connect to '%s'
> with error "
> +		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to connect to '%s'
> with error "
>  				"%s\n", fd_path, strerror(errno));
>  		return -1;
>  	}
> --
> 2.39.1

Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

Re: [PATCH v4 09/19] remove repeated word 'worker'

[Hunt, David]

On 22/02/2023 16:25, Stephen Hemminger wrote:
> Found by doing duplicate word scan.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>   lib/distributor/rte_distributor.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
> index 3969b2ea7e8a..c1a721dd821d 100644
> --- a/lib/distributor/rte_distributor.c
> +++ b/lib/distributor/rte_distributor.c
> @@ -576,7 +576,7 @@ rte_distributor_process(struct rte_distributor *d,
>   					}
>   				}
>   
> -				/* Add to current worker worker */
> +				/* Add to current worker */
>   				unsigned int idx = bl->count++;
>   
>   				bl->tags[idx] = new_tag;


Acked-by: David Hunt <david.hunt@intel.com>

Re: [PATCH v4 05/19] remove repeated word 'on'

[Hunt, David]

On 22/02/2023 16:25, Stephen Hemminger wrote:
> Found by doing duplicate word scan.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>   drivers/net/bonding/rte_eth_bond_8023ad.h   | 2 +-
>   examples/vm_power_manager/channel_monitor.h | 2 +-
>   examples/vm_power_manager/oob_monitor.h     | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
> index 7eb392f8c8a1..7ad8d6d00bd5 100644
> --- a/drivers/net/bonding/rte_eth_bond_8023ad.h
> +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
> @@ -271,7 +271,7 @@ rte_eth_bond_8023ad_ext_slowtx(uint16_t port_id, uint16_t slave_id,
>   		struct rte_mbuf *lacp_pkt);
>   
>   /**
> - * Enable dedicated hw queues for 802.3ad control plane traffic on on slaves
> + * Enable dedicated hw queues for 802.3ad control plane traffic on slaves
>    *
>    * This function creates an additional tx and rx queue on each slave for
>    * dedicated 802.3ad control plane traffic . A flow filtering rule is
> diff --git a/examples/vm_power_manager/channel_monitor.h b/examples/vm_power_manager/channel_monitor.h
> index 2b38c554b5cd..ab69524af52c 100644
> --- a/examples/vm_power_manager/channel_monitor.h
> +++ b/examples/vm_power_manager/channel_monitor.h
> @@ -41,7 +41,7 @@ extern "C" {
>   int channel_monitor_init(void);
>   
>   /**
> - * Run the channel monitor, loops forever on on epoll_wait.
> + * Run the channel monitor, loops forever on epoll_wait.
>    *
>    *
>    * @return
> diff --git a/examples/vm_power_manager/oob_monitor.h b/examples/vm_power_manager/oob_monitor.h
> index b96e08df782c..2389c1151956 100644
> --- a/examples/vm_power_manager/oob_monitor.h
> +++ b/examples/vm_power_manager/oob_monitor.h
> @@ -20,7 +20,7 @@ extern "C" {
>   int branch_monitor_init(void);
>   
>   /**
> - * Run the OOB branch monitor, loops forever on on epoll_wait.
> + * Run the OOB branch monitor, loops forever on epoll_wait.
>    *
>    *
>    * @return


Acked-by: David Hunt <david.hunt@intel.com>

Re: [PATCH v4 02/19] remove repeated word 'to'

[Hunt, David]

On 22/02/2023 16:25, Stephen Hemminger wrote:
> Found by doing duplicate word scan.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>   app/test/test_resource.c   | 2 +-
>   lib/pipeline/rte_swx_ctl.c | 2 +-
>   lib/power/guest_channel.c  | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/app/test/test_resource.c b/app/test/test_resource.c
> index 8f41e3babdc5..05c27db203cc 100644
> --- a/app/test/test_resource.c
> +++ b/app/test/test_resource.c
> @@ -45,7 +45,7 @@ static int test_resource_c(void)
>   			r->name);
>   
>   	TEST_ASSERT_SUCCESS(resource_fwrite_file(r, "test_resource.c"),
> -			"Failed to to write file %s", r->name);
> +			"Failed to write file %s", r->name);
>   
>   	f = fopen("test_resource.c", "r");
>   	TEST_ASSERT_NOT_NULL(f,
> diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
> index f7f49d7cebad..857770d297a4 100644
> --- a/lib/pipeline/rte_swx_ctl.c
> +++ b/lib/pipeline/rte_swx_ctl.c
> @@ -1683,7 +1683,7 @@ rte_swx_ctl_pipeline_table_entry_delete(struct rte_swx_ctl_pipeline *ctl,
>   	CHECK(!table_entry_check(ctl, table_id, entry, 1, 0), EINVAL);
>   
>   	/* The entry is found in the table->entries list:
> -	 * - Move the existing entry from the table->entries list to to the
> +	 * - Move the existing entry from the table->entries list to the
>   	 *   table->pending_delete list.
>   	 */
>   	existing_entry = table_entries_find(table, entry);
> diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
> index 969a9e5aaa06..7b2ae0b6506f 100644
> --- a/lib/power/guest_channel.c
> +++ b/lib/power/guest_channel.c
> @@ -74,7 +74,7 @@ guest_channel_host_connect(const char *path, unsigned int lcore_id)
>   			fd_path, lcore_id);
>   	fd = open(fd_path, O_RDWR);
>   	if (fd < 0) {
> -		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to to connect to '%s' with error "
> +		RTE_LOG(ERR, GUEST_CHANNEL, "Unable to connect to '%s' with error "
>   				"%s\n", fd_path, strerror(errno));
>   		return -1;
>   	}


Acked-by: David Hunt <david.hunt@intel.com>

RE: [PATCH v4 06/19] remove repeated word 'in'

[Van Haaren, Harry]

> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Wednesday, February 22, 2023 4:25 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Van Haaren, Harry
> <harry.van.haaren@intel.com>; Dongdong Liu <liudongdong3@huawei.com>; Yisen
> Zhuang <yisen.zhuang@huawei.com>; Matan Azrad <matan@nvidia.com>;
> Viacheslav Ovsiienko <viacheslavo@nvidia.com>; Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru>; Matz, Olivier <olivier.matz@6wind.com>
> Subject: [PATCH v4 06/19] remove repeated word 'in'

Lots of "in" and and one instance of "require" in in the event/sw PMD. Thanks for fixing!

> Found by doing duplicate word scan.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

All patch snippets LGTM:
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>

Re: [PATCH v4 00/19] Remove repeated words in comments and messages

[Thomas Monjalon]

22/02/2023 17:25, Stephen Hemminger:
> This is a cleanup of comments and messages. Done by an ugly
> pcregrep across sources and skipping lots of false positives
> 
> The idea is based of what some maintainers have been doing in netdev.
> 
> Series-acked-by: Bruce Richardson <bruce.richardson@intel.com> 
> 
> v4 - rebase and skip fixing common/sfc_efx/base
> 
> Stephen Hemminger (19):
>   ethdev: reword dev_info_get description.
>   remove repeated word 'to'
>   remove repeated word 'is'
>   remove repeated word 'same'
>   remove repeated word 'on'
>   remove repeated word 'in'
>   remove repeated word 'this'
>   remove repeated word 'only'
>   remove repeated word 'worker'
>   remove repeated word 'or'
>   remove repeated word 'table'
>   remove repeated word 'that'
>   remove repeated word 'override'
>   remove repeated word 'groups'
>   remove repeated word 'page'
>   remove repeated word 'individual'
>   remove repeated word 'expected'
>   remove repeated word 'be'
>   remove repeated word 'all'

Squashed and applied, thanks.