Patchwork [U-Boot] davinci, mmc: fix gcc 4.6 build warnings

login
register
mail settings
Submitter Heiko Schocher
Date Oct. 31, 2011, 5:15 a.m.
Message ID <1320038153-24364-1-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/122732/
State Accepted
Commit 79b05d59ade88a87a7d8a314f1ef4049b6cdde1d
Delegated to: Sandeep Paulraj
Headers show

Comments

Heiko Schocher - Oct. 31, 2011, 5:15 a.m.
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>
---
 drivers/mmc/davinci_mmc.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
Wolfgang Denk - Nov. 16, 2011, 7:51 p.m.
Dear Heiko Schocher,

In message <1320038153-24364-1-git-send-email-hs@denx.de> you wrote:
> 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>
> ---
>  drivers/mmc/davinci_mmc.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)

Applied, thanks.

Sandeep, Albert: hope this is OK with you.

Best regards,

Wolfgang Denk

Patch

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);