[PATCH net-next 0/5] net: intel: some cleanups

This patchset adds some cleanups for intel e1000/e1000e ethernet driver.

Hao Chen (5):
  net: e1000: remove repeated word "slot" for e1000_main.c
  net: e1000: remove repeated words for e1000_hw.c
  net: e1000e: remove repeated word "the" for ich8lan.c
  net: e1000e: remove repeated word "slot" for netdev.c
  net: e1000e: fix misspell word "retreived"

 drivers/net/ethernet/intel/e1000/e1000_hw.c   | 4 ++--
 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
 drivers/net/ethernet/intel/e1000e/ich8lan.c   | 2 +-
 drivers/net/ethernet/intel/e1000e/netdev.c    | 2 +-
 drivers/net/ethernet/intel/e1000e/phy.c       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.8.1

From: Hao Chen <redacted>

There are double "slot" in comment, so remove the redundant one.

Signed-off-by: Hao Chen <redacted>
Signed-off-by: Guangbin Huang <redacted>
---
 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 042de276e632..c2a109126c27 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c

@@ -5245,7 +5245,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
 	if (!test_and_set_bit(__E1000_DISABLED, &adapter->flags))
 		pci_disable_device(pdev);
 
-	/* Request a slot slot reset. */
+	/* Request a slot reset. */
 	return PCI_ERS_RESULT_NEED_RESET;
 }
 

-- 
2.8.1

From: Hao Chen <redacted>

There are double "in" and "to" in comments, so remove the redundant one.

Signed-off-by: Hao Chen <redacted>
Signed-off-by: Guangbin Huang <redacted>
---
 drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index 19cf36360933..1042e79a1397 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c

@@ -2522,7 +2522,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw)
 				 * turn it on. For compatibility with a TBI link
 				 * partner, we will store bad packets. Some
 				 * frames have an additional byte on the end and
-				 * will look like CRC errors to to the hardware.
+				 * will look like CRC errors to the hardware.
 				 */
 				if (!hw->tbi_compatibility_on) {
 					hw->tbi_compatibility_on = true;

@@ -2723,7 +2723,7 @@ static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count)
  * e1000_shift_in_mdi_bits - Shifts data bits in from the PHY
  * @hw: Struct containing variables accessed by shared code
  *
- * Bits are shifted in in MSB to LSB order.
+ * Bits are shifted in MSB to LSB order.
  */
 static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw)
 {

-- 
2.8.1

From: Hao Chen <redacted>

There is a misspell word "retreived" in comment, so fix it to "retrieved".

Signed-off-by: Hao Chen <redacted>
Signed-off-by: Guangbin Huang <redacted>
---
 drivers/net/ethernet/intel/e1000e/phy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 1db35b2c7750..0f0efee5fc8e 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c

@@ -2978,7 +2978,7 @@ static u32 e1000_get_phy_addr_for_hv_page(u32 page)
  *  @data: pointer to the data to be read or written
  *  @read: determines if operation is read or write
  *
- *  Reads the PHY register at offset and stores the retreived information
+ *  Reads the PHY register at offset and stores the retrieved information
  *  in data.  Assumes semaphore already acquired.  Note that the procedure
  *  to access these regs uses the address port and data port to read/write.
  *  These accesses done with PHY address 2 and without using pages.

-- 
2.8.1

From: Hao Chen <redacted>

There are double "slot" in comment, so remove the redundant one.

Signed-off-by: Hao Chen <redacted>
Signed-off-by: Guangbin Huang <redacted>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 88e9035b75cf..5435606149b0 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c

@@ -7118,7 +7118,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
 
 	pci_disable_device(pdev);
 
-	/* Request a slot slot reset. */
+	/* Request a slot reset. */
 	return PCI_ERS_RESULT_NEED_RESET;
 }
 

-- 
2.8.1

From: Hao Chen <redacted>

There are double "the" in comment, so remove the redundant one.

Signed-off-by: Hao Chen <redacted>
Signed-off-by: Guangbin Huang <redacted>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 590ad110d383..cf7b3887da1d 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c

@@ -4639,7 +4639,7 @@ static s32 e1000_id_led_init_pchlan(struct e1000_hw *hw)
  *  @hw: pointer to the HW structure
  *
  *  ICH8 use the PCI Express bus, but does not contain a PCI Express Capability
- *  register, so the the bus width is hard coded.
+ *  register, so the bus width is hard coded.
  **/
 static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
 {

-- 
2.8.1

On Wed, 2021-05-19 at 14:14 +0800, Guangbin Huang wrote:

This patchset adds some cleanups for intel e1000/e1000e ethernet
driver.

Hao Chen (5):
  net: e1000: remove repeated word "slot" for e1000_main.c
  net: e1000: remove repeated words for e1000_hw.c
  net: e1000e: remove repeated word "the" for ich8lan.c
  net: e1000e: remove repeated word "slot" for netdev.c
  net: e1000e: fix misspell word "retreived"

 drivers/net/ethernet/intel/e1000/e1000_hw.c   | 4 ++--
 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
 drivers/net/ethernet/intel/e1000e/ich8lan.c   | 2 +-
 drivers/net/ethernet/intel/e1000e/netdev.c    | 2 +-
 drivers/net/ethernet/intel/e1000e/phy.c       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Tony Nguyen <anthony.l.nguyen@intel.com>

Dave/Jakub - as these are just comment changes, did you want to pick
this up?

From: "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>
Date: Wed, 19 May 2021 18:48:51 +0000

On Wed, 2021-05-19 at 14:14 +0800, Guangbin Huang wrote:

quoted

This patchset adds some cleanups for intel e1000/e1000e ethernet
driver.

Hao Chen (5):
  net: e1000: remove repeated word "slot" for e1000_main.c
  net: e1000: remove repeated words for e1000_hw.c
  net: e1000e: remove repeated word "the" for ich8lan.c
  net: e1000e: remove repeated word "slot" for netdev.c
  net: e1000e: fix misspell word "retreived"

 drivers/net/ethernet/intel/e1000/e1000_hw.c   | 4 ++--
 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
 drivers/net/ethernet/intel/e1000e/ich8lan.c   | 2 +-
 drivers/net/ethernet/intel/e1000e/netdev.c    | 2 +-
 drivers/net/ethernet/intel/e1000e/phy.c       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Tony Nguyen <anthony.l.nguyen@intel.com>

Dave/Jakub - as these are just comment changes, did you want to pick
this up?

Sure.

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Wed, 19 May 2021 14:14:40 +0800 you wrote:

This patchset adds some cleanups for intel e1000/e1000e ethernet driver.

Hao Chen (5):
  net: e1000: remove repeated word "slot" for e1000_main.c
  net: e1000: remove repeated words for e1000_hw.c
  net: e1000e: remove repeated word "the" for ich8lan.c
  net: e1000e: remove repeated word "slot" for netdev.c
  net: e1000e: fix misspell word "retreived"

[...]

Here is the summary with links:
  - [net-next,1/5] net: e1000: remove repeated word "slot" for e1000_main.c
    https://git.kernel.org/netdev/net-next/c/4b63b27fc59a
  - [net-next,2/5] net: e1000: remove repeated words for e1000_hw.c
    https://git.kernel.org/netdev/net-next/c/e77471f1de0d
  - [net-next,3/5] net: e1000e: remove repeated word "the" for ich8lan.c
    https://git.kernel.org/netdev/net-next/c/59398afda176
  - [net-next,4/5] net: e1000e: remove repeated word "slot" for netdev.c
    https://git.kernel.org/netdev/net-next/c/800b74a57363
  - [net-next,5/5] net: e1000e: fix misspell word "retreived"
    https://git.kernel.org/netdev/net-next/c/0d27895bcbb4

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html