summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2011-10-30 19:15:53 +0000
committerWolfgang Denk <wd@denx.de>2011-11-16 20:51:14 +0100
commit79b05d59ade88a87a7d8a314f1ef4049b6cdde1d (patch)
treee4e6ecd7dd2e2a92e3228c0cf6736de903be6ea0
parent69de63e1f23e1529bfe0c3f0327d9c9272f3b9a8 (diff)
downloadu-boot-imx-79b05d59ade88a87a7d8a314f1ef4049b6cdde1d.zip
u-boot-imx-79b05d59ade88a87a7d8a314f1ef4049b6cdde1d.tar.gz
u-boot-imx-79b05d59ade88a87a7d8a314f1ef4049b6cdde1d.tar.bz2
davinci, mmc: fix gcc 4.6 build warnings
Fix: davinci_mmc.c: In function 'dmmc_wait_fifo_status': davinci_mmc.c:72:7: warning: variable 'mmcstatus1' set but not used [-Wunused-but-set-variable] davinci_mmc.c: In function 'dmmc_busy_wait': davinci_mmc.c:89:7: warning: variable 'mmcstatus1' set but not used [-Wunused-but-set-variable] Delete the unused variable. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
-rw-r--r--drivers/mmc/davinci_mmc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 5d918e6..ce96736 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -69,8 +69,8 @@ static void dmmc_set_clock(struct mmc *mmc, uint clock)
static int
dmmc_wait_fifo_status(volatile struct davinci_mmc_regs *regs, uint status)
{
- uint mmcstatus1, wdog = WATCHDOG_COUNT;
- mmcstatus1 = get_val(&regs->mmcst1);
+ uint wdog = WATCHDOG_COUNT;
+
while (--wdog && ((get_val(&regs->mmcst1) & status) != status))
udelay(10);
@@ -86,9 +86,8 @@ dmmc_wait_fifo_status(volatile struct davinci_mmc_regs *regs, uint status)
/* Busy bit wait loop for MMCST1 */
static int dmmc_busy_wait(volatile struct davinci_mmc_regs *regs)
{
- uint mmcstatus1, wdog = WATCHDOG_COUNT;
+ uint wdog = WATCHDOG_COUNT;
- mmcstatus1 = get_val(&regs->mmcst1);
while (--wdog && (get_val(&regs->mmcst1) & MMCST1_BUSY))
udelay(10);