Message ID | 9050fa278eaaa9e6ec719a3b158a2fad285560d0.1646311673.git.geert+renesas@glider.be |
---|---|
State | New |
Headers | show |
Series | mmc: Drop commas after SoC match table sentinels | expand |
On Thu, 3 Mar 2022 at 13:49, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > > It does not make sense to have a comma after a sentinel, as any new > elements must be added before the sentinel. > > Add comments to clarify the purpose of the empty elements. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- > drivers/mmc/host/sdhci-of-esdhc.c | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > index 9d2c600fd4ce2484..1685df00863b941a 100644 > --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > @@ -212,7 +212,7 @@ static const struct soc_device_attribute sdhi_quirks_match[] = { > { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_4tap }, > { .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_4tap_nohs400 }, > { .soc_id = "r8a7796", .revision = "ES1.*", .data = &sdhi_quirks_r8a7796_es13 }, > - { /* Sentinel. */ }, > + { /* Sentinel. */ } > }; > > static const struct renesas_sdhi_of_data_with_quirks of_r8a7795_compatible = { > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index 0f3658b36513c681..d9dc41143bb35d49 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -934,7 +934,7 @@ static struct soc_device_attribute soc_tuning_erratum_type1[] = { > { .family = "QorIQ T1040", }, > { .family = "QorIQ T2080", }, > { .family = "QorIQ LS1021A", }, > - { }, > + { /* sentinel */ } > }; > > static struct soc_device_attribute soc_tuning_erratum_type2[] = { > @@ -944,7 +944,7 @@ static struct soc_device_attribute soc_tuning_erratum_type2[] = { > { .family = "QorIQ LS1080A", }, > { .family = "QorIQ LS2080A", }, > { .family = "QorIQ LA1575A", }, > - { }, > + { /* sentinel */ } > }; > > static void esdhc_tuning_block_enable(struct sdhci_host *host, bool enable) > @@ -1316,21 +1316,21 @@ static const struct sdhci_pltfm_data sdhci_esdhc_le_pdata = { > static struct soc_device_attribute soc_incorrect_hostver[] = { > { .family = "QorIQ T4240", .revision = "1.0", }, > { .family = "QorIQ T4240", .revision = "2.0", }, > - { }, > + { /* sentinel */ } > }; > > static struct soc_device_attribute soc_fixup_sdhc_clkdivs[] = { > { .family = "QorIQ LX2160A", .revision = "1.0", }, > { .family = "QorIQ LX2160A", .revision = "2.0", }, > { .family = "QorIQ LS1028A", .revision = "1.0", }, > - { }, > + { /* sentinel */ } > }; > > static struct soc_device_attribute soc_unreliable_pulse_detection[] = { > { .family = "QorIQ LX2160A", .revision = "1.0", }, > { .family = "QorIQ LX2160A", .revision = "2.0", }, > { .family = "QorIQ LS1028A", .revision = "1.0", }, > - { }, > + { /* sentinel */ } > }; > > static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host) > -- > 2.25.1 >
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 9d2c600fd4ce2484..1685df00863b941a 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -212,7 +212,7 @@ static const struct soc_device_attribute sdhi_quirks_match[] = { { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_4tap_nohs400 }, { .soc_id = "r8a7796", .revision = "ES1.*", .data = &sdhi_quirks_r8a7796_es13 }, - { /* Sentinel. */ }, + { /* Sentinel. */ } }; static const struct renesas_sdhi_of_data_with_quirks of_r8a7795_compatible = { diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 0f3658b36513c681..d9dc41143bb35d49 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -934,7 +934,7 @@ static struct soc_device_attribute soc_tuning_erratum_type1[] = { { .family = "QorIQ T1040", }, { .family = "QorIQ T2080", }, { .family = "QorIQ LS1021A", }, - { }, + { /* sentinel */ } }; static struct soc_device_attribute soc_tuning_erratum_type2[] = { @@ -944,7 +944,7 @@ static struct soc_device_attribute soc_tuning_erratum_type2[] = { { .family = "QorIQ LS1080A", }, { .family = "QorIQ LS2080A", }, { .family = "QorIQ LA1575A", }, - { }, + { /* sentinel */ } }; static void esdhc_tuning_block_enable(struct sdhci_host *host, bool enable) @@ -1316,21 +1316,21 @@ static const struct sdhci_pltfm_data sdhci_esdhc_le_pdata = { static struct soc_device_attribute soc_incorrect_hostver[] = { { .family = "QorIQ T4240", .revision = "1.0", }, { .family = "QorIQ T4240", .revision = "2.0", }, - { }, + { /* sentinel */ } }; static struct soc_device_attribute soc_fixup_sdhc_clkdivs[] = { { .family = "QorIQ LX2160A", .revision = "1.0", }, { .family = "QorIQ LX2160A", .revision = "2.0", }, { .family = "QorIQ LS1028A", .revision = "1.0", }, - { }, + { /* sentinel */ } }; static struct soc_device_attribute soc_unreliable_pulse_detection[] = { { .family = "QorIQ LX2160A", .revision = "1.0", }, { .family = "QorIQ LX2160A", .revision = "2.0", }, { .family = "QorIQ LS1028A", .revision = "1.0", }, - { }, + { /* sentinel */ } }; static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host)
It does not make sense to have a comma after a sentinel, as any new elements must be added before the sentinel. Add comments to clarify the purpose of the empty elements. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/mmc/host/sdhci-of-esdhc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)