]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
mmc: tegra: remove vcore override late_initcall
authorShreshtha Sahu <ssahu@nvidia.com>
Tue, 29 Apr 2014 10:07:38 +0000 (15:37 +0530)
committerLaxman Dewangan <ldewangan@nvidia.com>
Thu, 22 May 2014 11:05:37 +0000 (04:05 -0700)
This patch removes vcore override late_initcall
as it is no longer required for new tuning algo.

In addition this removes two initcalls from
same module and thus let mmc to compile as module.
Along with this unused vairables are removed.

Bug 1499809

Change-Id: Id68d9f4115a860b152703ee6c3fe677eb0230193
Signed-off-by: Shreshtha Sahu <ssahu@nvidia.com>
Reviewed-on: http://git-master/r/402916
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
drivers/mmc/host/sdhci-tegra.c

index af61736ccc630d5bc2f68c8673758bef07ff35df..f6feac2d395cdd4bf3f52b2afdae752d7e528530 100644 (file)
@@ -564,8 +564,6 @@ static struct clk *pll_c;
 static struct clk *pll_p;
 static unsigned long pll_c_rate;
 static unsigned long pll_p_rate;
-static bool vcore_overrides_allowed;
-static bool maintain_boot_voltage;
 static unsigned int boot_volt_req_refcount;
 DEFINE_MUTEX(tuning_mutex);
 
@@ -3031,8 +3029,7 @@ static int sdhci_tegra_set_tuning_voltage(struct sdhci_host *sdhci,
        int err = 0;
        bool nom_emc_freq_set = false;
 
-       if (voltage && (voltage != tegra_host->boot_vcore_mv) &&
-               !vcore_overrides_allowed) {
+       if (voltage && (voltage != tegra_host->boot_vcore_mv)) {
                SDHCI_TEGRA_DBG("%s: Override vcore %dmv not allowed\n",
                        mmc_hostname(sdhci->mmc), voltage);
                return -EPERM;
@@ -3282,14 +3279,6 @@ out:
        return err;
 }
 
-static int __init sdhci_tegra_enable_vcore_override_tuning(void)
-{
-       vcore_overrides_allowed = true;
-       maintain_boot_voltage = false;
-       return 0;
-}
-late_initcall(sdhci_tegra_enable_vcore_override_tuning);
-
 static int tegra_sdhci_suspend(struct sdhci_host *sdhci)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(sdhci);