| Message ID | 1361385317-6020-4-git-send-email-rklein@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 02/20/2013 11:35 AM, Rhyland Klein wrote: > 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. Patch 3 and 4 to the MMC driver look fine. But I'd ask Chris to hold off on applying them for 3.10 until I've sorted out the dependencies of Joseph Lo's MMC patches; if I can get the device tree fix for the CD GPIO polarity into 3.9/stable as a bug-fix, there will be no dependency issue I think. Otherwise, I'll probably want to take all the Tegra SDHCI changes through the Tegra tree for 3.10 to resolve the dependencies. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/20/2013 11:35 AM, Rhyland Klein wrote: > 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. Chris, I think patches 3 and 4 of this series can go through either the MMC tree (I checked there are no conflicts with the MMC patch I have to take through the Tegra tree), or the Tegra tree (since I'm taking another Tegra MMC patch though there), both without any dependency issues. It's your call. Let me know if you want me to take them through the Tegra tree with an ack. Or, if you want to take them through the MMC tree that's fine too. If you need them reposted to see the content, let me know, or they're at: http://patchwork.ozlabs.org/patch/222136/ http://patchwork.ozlabs.org/patch/222138/ Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, Mar 06 2013, Stephen Warren wrote: > On 02/20/2013 11:35 AM, Rhyland Klein wrote: >> 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. > > I think patches 3 and 4 of this series can go through either the MMC > tree (I checked there are no conflicts with the MMC patch I have to take > through the Tegra tree), or the Tegra tree (since I'm taking another > Tegra MMC patch though there), both without any dependency issues. > > It's your call. Let me know if you want me to take them through the > Tegra tree with an ack. Or, if you want to take them through the MMC > tree that's fine too. If you need them reposted to see the content, let > me know, or they're at: Via the MMC tree with an ack sounds good, just for the mundane reason that I like my "highlights for 3.10" pull request to Linus to mention when support for new MMC hardware is added, and it won't do that if the tegra110 patch is coming through your tree. Thanks, - Chris.
On 03/06/2013 03:54 PM, Chris Ball wrote: > Hi, > > On Wed, Mar 06 2013, Stephen Warren wrote: >> On 02/20/2013 11:35 AM, Rhyland Klein wrote: >>> 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. >> >> I think patches 3 and 4 of this series can go through either the MMC >> tree (I checked there are no conflicts with the MMC patch I have to take >> through the Tegra tree), or the Tegra tree (since I'm taking another >> Tegra MMC patch though there), both without any dependency issues. >> >> It's your call. Let me know if you want me to take them through the >> Tegra tree with an ack. Or, if you want to take them through the MMC >> tree that's fine too. If you need them reposted to see the content, let >> me know, or they're at: > > Via the MMC tree with an ack sounds good OK, thanks. Patches 3/4 and 4/4, Acked-by: Stephen Warren <swarren@nvidia.com> -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, Mar 06 2013, Stephen Warren wrote: >> Via the MMC tree with an ack sounds good > > OK, thanks. Patches 3/4 and 4/4, > Acked-by: Stephen Warren <swarren@nvidia.com> Thanks, both pushed out to mmc-next for 3.10 now. - Chris.
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 1276131..5e126bf 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -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);
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: Rhyland Klein <rklein@nvidia.com> --- drivers/mmc/host/sdhci-tegra.c | 8 -------- 1 file changed, 8 deletions(-)