Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76f3ae12 authored by Rhyland Klein's avatar Rhyland Klein Committed by Chris Ball
Browse files

mmc: sdhci-tegra: cleanup ifdefs 



The structs wrapped with the SOC ifdefs are small enough where having
them always there shouldn't be a big overhead. Removing the ifdefs
also makes the code a little cleaner.

Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent adf96e6f

drivers/mmc/host/sdhci-tegra.c

+0 −8
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ static struct sdhci_ops tegra_sdhci_ops = { 
	.platform_reset_exit = tegra_sdhci_reset_exit,

};



#ifdef CONFIG_ARCH_TEGRA_2x_SOC

static struct sdhci_pltfm_data sdhci_tegra20_pdata = {

	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |

		  SDHCI_QUIRK_SINGLE_POWER_WRITE |
@@ -187,9 +186,7 @@ static struct sdhci_tegra_soc_data soc_data_tegra20 = { 
	.nvquirks = NVQUIRK_FORCE_SDHCI_SPEC_200 |

		    NVQUIRK_ENABLE_BLOCK_GAP_DET,

};

#endif



#ifdef CONFIG_ARCH_TEGRA_3x_SOC

static struct sdhci_pltfm_data sdhci_tegra30_pdata = {

	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |

		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
@@ -203,15 +200,10 @@ static struct sdhci_tegra_soc_data soc_data_tegra30 = { 
	.pdata = &sdhci_tegra30_pdata,

	.nvquirks = NVQUIRK_ENABLE_SDHCI_SPEC_300,

};

#endif



static const struct of_device_id sdhci_tegra_dt_match[] = {

#ifdef CONFIG_ARCH_TEGRA_3x_SOC

	{ .compatible = "nvidia,tegra30-sdhci", .data = &soc_data_tegra30 },

#endif

#ifdef CONFIG_ARCH_TEGRA_2x_SOC

	{ .compatible = "nvidia,tegra20-sdhci", .data = &soc_data_tegra20 },

#endif

	{}

};

MODULE_DEVICE_TABLE(of, sdhci_dt_ids);