Message ID | 20221102120105.5747-1-adrian.hunter@intel.com |
---|---|
State | New |
Headers | show |
Series | mmc: Remove duplicate words in comments | expand |
On Wed, 2 Nov 2022 at 13:21, Adrian Hunter <adrian.hunter@intel.com> wrote: > > 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 > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Nice way of doing things like this! Applied for next, thanks! Kind regards Uffe > --- > 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(-) > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > index 95fa8fb1d45f..757208b5a65c 100644 > --- a/drivers/mmc/core/core.c > +++ b/drivers/mmc/core/core.c > @@ -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. > diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c > index b89dca1f15e9..5457c8aeeea1 100644 > --- a/drivers/mmc/core/host.c > +++ b/drivers/mmc/core/host.c > @@ -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. > */ > diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c > index bddfaba091a9..8f0e639236b1 100644 > --- a/drivers/mmc/host/sdhci-acpi.c > +++ b/drivers/mmc/host/sdhci-acpi.c > @@ -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; > > diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c > index 61a12f2f7f03..6a93a54fe067 100644 > --- a/drivers/mmc/host/sdhci-bcm-kona.c > +++ b/drivers/mmc/host/sdhci-bcm-kona.c > @@ -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); > diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c > index 033be559a730..8ed9256b83da 100644 > --- a/drivers/mmc/host/sdhci-omap.c > +++ b/drivers/mmc/host/sdhci-omap.c > @@ -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) { > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index d750c464bd1e..908da47ac5ba 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -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 >
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 95fa8fb1d45f..757208b5a65c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -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. diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index b89dca1f15e9..5457c8aeeea1 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -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. */ diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index bddfaba091a9..8f0e639236b1 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -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; diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 61a12f2f7f03..6a93a54fe067 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -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); diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c index 033be559a730..8ed9256b83da 100644 --- a/drivers/mmc/host/sdhci-omap.c +++ b/drivers/mmc/host/sdhci-omap.c @@ -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) { diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index d750c464bd1e..908da47ac5ba 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -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 /*
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 Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- 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(-)