LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: Remove incorrect cmd->flags usage 

There were a couple of drivers that were actually using the flags
field of the cmd structure, despite the fact that no one ever
*set* that field. When we removed the field, those drivers failed
to compile. Replaced the references with the correct usage of
resp_type.

Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Andy Fleming 2012-09-06 15:23:13 -05:00
parent b09ed6e4fe
commit 95b01c47ed
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/arm_pl180_mmci.c
View File

@ -52,7 +52,7 @@ static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)
debug("CMD%d time out\n", cmd->cmdidx); debug("CMD%d time out\n", cmd->cmdidx);
return TIMEOUT; return TIMEOUT;
} else if ((hoststatus & SDI_STA_CCRCFAIL) && } else if ((hoststatus & SDI_STA_CCRCFAIL) &&
(cmd->flags & MMC_RSP_CRC)) { (cmd->resp_type & MMC_RSP_CRC)) {
printf("CMD%d CRC error\n", cmd->cmdidx); printf("CMD%d CRC error\n", cmd->cmdidx);
return -EILSEQ; return -EILSEQ;
} }

8
drivers/mmc/pxa_mmc_gen.c
View File

@ -118,7 +118,7 @@ static int pxa_mmc_start_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
int ret; int ret;
/* The card can send a "busy" response */ /* The card can send a "busy" response */
if (cmd->flags & MMC_RSP_BUSY) if (cmd->resp_type & MMC_RSP_BUSY)
cmdat |= MMC_CMDAT_BUSY; cmdat |= MMC_CMDAT_BUSY;
/* Inform the controller about response type */ /* Inform the controller about response type */
@ -181,9 +181,11 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd)
/* The command response didn't arrive */ /* The command response didn't arrive */
if (stat & MMC_STAT_TIME_OUT_RESPONSE) if (stat & MMC_STAT_TIME_OUT_RESPONSE)
return -ETIMEDOUT; return -ETIMEDOUT;
else if (stat & MMC_STAT_RES_CRC_ERROR && cmd->flags & MMC_RSP_CRC) { else if (stat & MMC_STAT_RES_CRC_ERROR
&& cmd->resp_type & MMC_RSP_CRC) {
#ifdef PXAMMC_CRC_SKIP #ifdef PXAMMC_CRC_SKIP
if (cmd->flags & MMC_RSP_136 && cmd->response[0] & (1 << 31)) if (cmd->resp_type & MMC_RSP_136
&& cmd->response[0] & (1 << 31))
printf("Ignoring CRC, this may be dangerous!\n"); printf("Ignoring CRC, this may be dangerous!\n");
else else
#endif #endif