Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drivers/mmc/fsl_esdhc.c: fix compiler warnings

Browse source 
Commit 77c1458d caused the following compiler warnings:

fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:142: warning: assignment discards qualifiers from pointer target type
fsl_esdhc.c: In function 'esdhc_setup_data':
fsl_esdhc.c:169: warning: unused variable 'wml_value'
fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:164: warning: control reaches end of non-void function

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Dipen Dudhat <dipen.dudhat@freescale.com>
Cc: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Wolfgang Denk 2010-05-09 23:52:59 +02:00
parent ab92d0fd9a
commit 7b43db9211
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/mmc/fsl_esdhc.c
View file

@ -103,7 +103,7 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
/* /*
* PIO Read/Write Mode reduce the performace as DMA is not used in this mode. * PIO Read/Write Mode reduce the performace as DMA is not used in this mode.
*/ */
static int static void
esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data) esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data)
{ {
struct fsl_esdhc *regs = mmc->priv; struct fsl_esdhc *regs = mmc->priv;
@ -125,7 +125,7 @@ esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data)
&& --timeout); && --timeout);
if (timeout <= 0) { if (timeout <= 0) {
printf("\nData Read Failed in PIO Mode."); printf("\nData Read Failed in PIO Mode.");
return timeout; return;
} }
while (size && (!(irqstat & IRQSTAT_TC))) { while (size && (!(irqstat & IRQSTAT_TC))) {
udelay(100); /* Wait before last byte transfer complete */ udelay(100); /* Wait before last byte transfer complete */
@ -139,7 +139,7 @@ esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data)
} }
} else { } else {
blocks = data->blocks; blocks = data->blocks;
buffer = data->src; buffer = (char *)data->src;
while (blocks) { while (blocks) {
timeout = PIO_TIMEOUT; timeout = PIO_TIMEOUT;
size = data->blocksize; size = data->blocksize;
@ -148,7 +148,7 @@ esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data)
&& --timeout); && --timeout);
if (timeout <= 0) { if (timeout <= 0) {
printf("\nData Write Failed in PIO Mode."); printf("\nData Write Failed in PIO Mode.");
return timeout; return;
} }
while (size && (!(irqstat & IRQSTAT_TC))) { while (size && (!(irqstat & IRQSTAT_TC))) {
udelay(100); /* Wait before last byte transfer complete */ udelay(100); /* Wait before last byte transfer complete */
@ -166,22 +166,12 @@ esdhc_pio_read_write(struct mmc *mmc, struct mmc_data *data)
static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
{ {
uint wml_value;
int timeout; int timeout;
struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base;
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
uint wml_value;
#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO
if (!(data->flags & MMC_DATA_READ)) {
if ((esdhc_read32(&regs->prsstat) & PRSSTAT_WPSPL) == 0) {
printf("\nThe SD card is locked. "
"Can not write to a locked card.\n\n");
return TIMEOUT;
}
esdhc_write32(&regs->dsaddr, (u32)data->src);
} else
esdhc_write32(&regs->dsaddr, (u32)data->dest);
#else
wml_value = data->blocksize/4; wml_value = data->blocksize/4;
if (data->flags & MMC_DATA_READ) { if (data->flags & MMC_DATA_READ) {
@ -202,7 +192,17 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
wml_value << 16); wml_value << 16);
esdhc_write32(&regs->dsaddr, (u32)data->src); esdhc_write32(&regs->dsaddr, (u32)data->src);
} }
#endif #else /* CONFIG_SYS_FSL_ESDHC_USE_PIO */
if (!(data->flags & MMC_DATA_READ)) {
if ((esdhc_read32(&regs->prsstat) & PRSSTAT_WPSPL) == 0) {
printf("\nThe SD card is locked. "
"Can not write to a locked card.\n\n");
return TIMEOUT;
}
esdhc_write32(&regs->dsaddr, (u32)data->src);
} else
esdhc_write32(&regs->dsaddr, (u32)data->dest);
#endif /* CONFIG_SYS_FSL_ESDHC_USE_PIO */
esdhc_write32(&regs->blkattr, data->blocks << 16 | data->blocksize); esdhc_write32(&regs->blkattr, data->blocks << 16 | data->blocksize);