summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalaji T K <balajitk@ti.com>2014-02-28 14:38:24 +0100
committerChris Ball <chris@printf.net>2014-03-04 17:45:05 +0100
commit4ea42235b5a999eff57f38696ae532a6b9377c55 (patch)
tree9e8145125868064c568217e801a64a0057757132
parentmmc: omap_hsmmc: fix return error code for of_get_hsmmc_pdata (diff)
downloadlinux-4ea42235b5a999eff57f38696ae532a6b9377c55.tar.xz
linux-4ea42235b5a999eff57f38696ae532a6b9377c55.zip
mmc: omap_hsmmc: remove redundant reset done
Remove redundant reset done check since omap hwmod layer ensures IP reset. Signed-off-by: Balaji T K <balajitk@ti.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Chris Ball <chris@printf.net>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index f4e5a59a84c0..d9c84ea46b63 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -97,7 +97,6 @@
#define SRC (1 << 25)
#define SRD (1 << 26)
#define SOFTRESET (1 << 1)
-#define RESETDONE (1 << 0)
/* Interrupt masks for IE and ISE register */
#define CC_EN (1 << 0)
@@ -632,9 +631,6 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
u32 hctl, capa;
unsigned long timeout;
- if (!OMAP_HSMMC_READ(host->base, SYSSTATUS) & RESETDONE)
- return 1;
-
if (host->con == OMAP_HSMMC_READ(host->base, CON) &&
host->hctl == OMAP_HSMMC_READ(host->base, HCTL) &&
host->sysctl == OMAP_HSMMC_READ(host->base, SYSCTL) &&