summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorvjagadish <vjagadish@nvidia.com>2011-09-27 16:12:22 +0530
committerLokesh Pathak <lpathak@nvidia.com>2011-11-09 07:22:58 -0800
commit2eef9356f38e3cdfa3378cb61a615a39272b203f (patch)
tree21d4e9b7b0728c52dcb1dc9daecb1938e7437d4a /drivers
parentd38886953cdfc8f4ddbc7c9b51b3abb22873a103 (diff)
sdhci: tegra: code cleanup
replaced space with tab in multiple places. Reviewed-on: http://git-master/r/54677 (cherry picked from commit a7b9fd1a1cf2d99db16acf3bc6aa4da44f1d38c2) Change-Id: I4860b15d0d2d40e85649212994dd99b05ee920cc Reviewed-on: http://git-master/r/62322 Reviewed-by: Venkata Jagadish <vjagadish@nvidia.com> Tested-by: Venkata Jagadish <vjagadish@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-tegra.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index d667768765f4..99646c3c8ebd 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -615,7 +615,6 @@ static int tegra_sdhci_resume(struct platform_device *pdev)
int ret = 0;
if (host->card_always_on && is_card_sdio(host->sdhci->mmc->card)) {
- int ret = 0;
if (device_may_wakeup(&pdev->dev))
disable_irq_wake(host->sdhci->irq);
@@ -633,10 +632,9 @@ static int tegra_sdhci_resume(struct platform_device *pdev)
return 0;
}
- if (host->cd_gpio != -1) {
- int prev_card_present_stat = 0;
- prev_card_present_stat = host->card_present;
+ if (host->cd_gpio != -1) {
+ int prev_card_present_stat = host->card_present;
host->card_present =
(gpio_get_value(host->cd_gpio) == host->cd_gpio_polarity);
@@ -644,6 +642,7 @@ static int tegra_sdhci_resume(struct platform_device *pdev)
if (prev_card_present_stat != host->card_present)
sdhci_card_detect_callback(host->sdhci);
}
+
if(host->card_present){
if(host->is_rail_enabled == 0){
if (host->reg_vdd_slot)
@@ -660,7 +659,6 @@ static int tegra_sdhci_resume(struct platform_device *pdev)
if (ret)
pr_err("%s: failed, error = %d\n", __func__, ret);
-
return ret;
}
#else