Skip to contentSkip to conversation

mmc: Remove duplicate words in comments

PATCH In review Adrian Hunter 2 participants 2 messages Nov 2, 2022 – Nov 7, 2022

Subsystems (4)
lore
Share & tools
lore

Adrian Hunter

author maintainer
#0 lore raw

PATCH 1/1 mmc: Remove duplicate words in comments

Remove duplicate words in comments found using the following commands:

pcregrep --color=always -n \
	'([^a-zA-Z_])([a-zA-Z_]+)[[:space:]]+\2[^a-zA-Z_]' \
	drivers/mmc/host/*.[ch] drivers/mmc/core/*.[ch] \
	include/linux/mmc/*.h \
	include/uapi/linux/mmc/*.h | \
	grep -v 'long long'
pcregrep --color=always -n -M \
	'([^a-zA-Z_])([a-zA-Z_]+)[ \t]*\n[[:space:]*]+\2[^a-zA-Z_]' \
	drivers/mmc/host/*.[ch] \
	drivers/mmc/core/*.[ch] \
	include/linux/mmc/*.h \
	include/uapi/linux/mmc/*.h
---
 drivers/mmc/core/core.c           | 4 ++--
 drivers/mmc/core/host.c           | 2 +-
 drivers/mmc/host/sdhci-acpi.c     | 2 +-
 drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
 drivers/mmc/host/sdhci-omap.c     | 2 +-
 drivers/mmc/host/sdhci.h          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/mmc/core/core.c +2 -2
index 95fa8fb1d45f..757208b5a65c 100644
@@ -56,7 +56,7 @@ static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };
 /*
  * Enabling software CRCs on the data blocks can be a significant (30%)
  * performance cost, and for other reasons may not always be desired.
- * So we allow it it to be disabled.
+ * So we allow it to be disabled.
  */
 bool use_spi_crc = 1;
 module_param(use_spi_crc, bool, 0);
@@ -527,7 +527,7 @@ EXPORT_SYMBOL(mmc_cqe_post_req);
  * mmc_cqe_recovery - Recover from CQE errors.
  * @host: MMC host to recover
  *
- * Recovery consists of stopping CQE, stopping eMMC, discarding the queue in
+ * Recovery consists of stopping CQE, stopping eMMC, discarding the queue
  * in eMMC, and discarding the queue in CQE. CQE must call
  * mmc_cqe_request_done() on all requests. An error is returned if the eMMC
  * fails to discard its queue.
drivers/mmc/core/host.c +1 -1
index b89dca1f15e9..5457c8aeeea1 100644
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(mmc_of_parse_clk_phase);
  * @host: host whose properties should be parsed.
  *
  * To keep the rest of the MMC subsystem unaware of whether DT has been
- * used to to instantiate and configure this host instance or not, we
+ * used to instantiate and configure this host instance or not, we
  * parse the properties and set respective generic mmc-host flags and
  * parameters.
  */
drivers/mmc/host/sdhci-acpi.c +1 -1
index bddfaba091a9..8f0e639236b1 100644
@@ -651,7 +651,7 @@ static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev,
 	 *       instead use the SDR104 preset register.
 	 *
 	 *    If the above issues are resolved we could remove this quirk for
-	 *    firmware that that has valid presets (i.e., SDR12 <= 12 MHz).
+	 *    firmware that has valid presets (i.e., SDR12 <= 12 MHz).
 	 */
 	host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
 
drivers/mmc/host/sdhci-bcm-kona.c +1 -1
index 61a12f2f7f03..6a93a54fe067 100644
@@ -168,7 +168,7 @@ static void sdhci_bcm_kona_init_74_clocks(struct sdhci_host *host,
 	/*
 	 *  JEDEC and SD spec specify supplying 74 continuous clocks to
 	 * device after power up. With minimum bus (100KHz) that
-	 * that translates to 740us
+	 * translates to 740us
 	 */
 	if (power_mode != MMC_POWER_OFF)
 		udelay(740);
drivers/mmc/host/sdhci-omap.c +1 -1
index 033be559a730..8ed9256b83da 100644
@@ -370,7 +370,7 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode)
 
 	/*
 	 * Stage 1: Search for a maximum pass window ignoring any
-	 * any single point failures. If the tuning value ends up
+	 * single point failures. If the tuning value ends up
 	 * near it, move away from it in stage 2 below
 	 */
 	while (phase_delay <= MAX_PHASE_DELAY) {
drivers/mmc/host/sdhci.h +1 -1
index d750c464bd1e..908da47ac5ba 100644
@@ -345,7 +345,7 @@ struct sdhci_adma2_64_desc {
  */
 #define SDHCI_MAX_SEGS		128
 
-/* Allow for a a command request and a data request at the same time */
+/* Allow for a command request and a data request at the same time */
 #define SDHCI_MAX_MRQS		2
 
 /*
Signature · 1 line
2.34.1
#1 lore raw
Quoted 10 lines · Adrian Hunter

Remove duplicate words in comments found using the following commands:

pcregrep --color=always -n \
        '([^a-zA-Z_])([a-zA-Z_]+)[[:space:]]+\2[^a-zA-Z_]' \
        drivers/mmc/host/*.[ch] drivers/mmc/core/*.[ch] \
        include/linux/mmc/*.h \
        include/uapi/linux/mmc/*.h | \
        grep -v 'long long'
Quoted 8 lines
pcregrep --color=always -n -M \
        '([^a-zA-Z_])([a-zA-Z_]+)[ \t]*\n[[:space:]*]+\2[^a-zA-Z_]' \
        drivers/mmc/host/*.[ch] \
        drivers/mmc/core/*.[ch] \
        include/linux/mmc/*.h \
        include/uapi/linux/mmc/*.h

Nice way of doing things like this!

Applied for next, thanks!

Kind regards
Uffe

Quoted 99 lines
---
 drivers/mmc/core/core.c           | 4 ++--
 drivers/mmc/core/host.c           | 2 +-
 drivers/mmc/host/sdhci-acpi.c     | 2 +-
 drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
 drivers/mmc/host/sdhci-omap.c     | 2 +-
 drivers/mmc/host/sdhci.h          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/mmc/core/core.c +2 -2
index 95fa8fb1d45f..757208b5a65c 100644
@@ -56,7 +56,7 @@ static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };
 /*
  * Enabling software CRCs on the data blocks can be a significant (30%)
  * performance cost, and for other reasons may not always be desired.
- * So we allow it it to be disabled.
+ * So we allow it to be disabled.
  */
 bool use_spi_crc = 1;
 module_param(use_spi_crc, bool, 0);
@@ -527,7 +527,7 @@ EXPORT_SYMBOL(mmc_cqe_post_req);
  * mmc_cqe_recovery - Recover from CQE errors.
  * @host: MMC host to recover
  *
- * Recovery consists of stopping CQE, stopping eMMC, discarding the queue in
+ * Recovery consists of stopping CQE, stopping eMMC, discarding the queue
  * in eMMC, and discarding the queue in CQE. CQE must call
  * mmc_cqe_request_done() on all requests. An error is returned if the eMMC
  * fails to discard its queue.
drivers/mmc/core/host.c +1 -1
index b89dca1f15e9..5457c8aeeea1 100644
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(mmc_of_parse_clk_phase);
  * @host: host whose properties should be parsed.
  *
  * To keep the rest of the MMC subsystem unaware of whether DT has been
- * used to to instantiate and configure this host instance or not, we
+ * used to instantiate and configure this host instance or not, we
  * parse the properties and set respective generic mmc-host flags and
  * parameters.
  */
drivers/mmc/host/sdhci-acpi.c +1 -1
index bddfaba091a9..8f0e639236b1 100644
@@ -651,7 +651,7 @@ static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev,
         *       instead use the SDR104 preset register.
         *
         *    If the above issues are resolved we could remove this quirk for
-        *    firmware that that has valid presets (i.e., SDR12 <= 12 MHz).
+        *    firmware that has valid presets (i.e., SDR12 <= 12 MHz).
         */
        host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
 
drivers/mmc/host/sdhci-bcm-kona.c +1 -1
index 61a12f2f7f03..6a93a54fe067 100644
@@ -168,7 +168,7 @@ static void sdhci_bcm_kona_init_74_clocks(struct sdhci_host *host,
        /*
         *  JEDEC and SD spec specify supplying 74 continuous clocks to
         * device after power up. With minimum bus (100KHz) that
-        * that translates to 740us
+        * translates to 740us
         */
        if (power_mode != MMC_POWER_OFF)
                udelay(740);
drivers/mmc/host/sdhci-omap.c +1 -1
index 033be559a730..8ed9256b83da 100644
@@ -370,7 +370,7 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode)
 
        /*
         * Stage 1: Search for a maximum pass window ignoring any
-        * any single point failures. If the tuning value ends up
+        * single point failures. If the tuning value ends up
         * near it, move away from it in stage 2 below
         */
        while (phase_delay <= MAX_PHASE_DELAY) {
drivers/mmc/host/sdhci.h +1 -2
index d750c464bd1e..908da47ac5ba 100644
@@ -345,7 +345,7 @@ struct sdhci_adma2_64_desc {
  */
 #define SDHCI_MAX_SEGS         128
 
-/* Allow for a a command request and a data request at the same time */
+/* Allow for a command request and a data request at the same time */
 #define SDHCI_MAX_MRQS         2
 
 /*
--

2.34.1