lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: MXC: mxcmmc: misc cleanups

Browse Source 
Be more verbose on error messages and add one debug message.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Volker Ernst <volker.ernst@txtr.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Michał Mirosław <mirqus@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Daniel Mack
2010-04-01 10:03:23 +02:00
committed by Sascha Hauer
parent 066fb84720
commit 4725f6f176
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/mmc/host/mxcmmc.c
View File

@@ -151,6 +151,8 @@ static void mxcmci_softreset(struct mxcmci_host *host)
{ {
int i; int i;
dev_dbg(mmc_dev(host->mmc), "mxcmci_softreset\n");
/* reset sequence */ /* reset sequence */
writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK); writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK);
writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK, writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
@@ -290,16 +292,25 @@ static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat)
dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n", dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n",
stat); stat);
if (stat & STATUS_CRC_READ_ERR) { if (stat & STATUS_CRC_READ_ERR) {
dev_err(mmc_dev(host->mmc), "%s: -EILSEQ\n", __func__);
data->error = -EILSEQ; data->error = -EILSEQ;
} else if (stat & STATUS_CRC_WRITE_ERR) { } else if (stat & STATUS_CRC_WRITE_ERR) {
u32 err_code = (stat >> 9) & 0x3; u32 err_code = (stat >> 9) & 0x3;
if (err_code == 2) /* No CRC response */ if (err_code == 2) { /* No CRC response */
data->error = -ETIMEDOUT; dev_err(mmc_dev(host->mmc),
else "%s: No CRC -ETIMEDOUT\n", __func__);
data->error = -EILSEQ;
} else if (stat & STATUS_TIME_OUT_READ) {
data->error = -ETIMEDOUT; data->error = -ETIMEDOUT;
} else { } else {
dev_err(mmc_dev(host->mmc),
"%s: -EILSEQ\n", __func__);
data->error = -EILSEQ;
}
} else if (stat & STATUS_TIME_OUT_READ) {
dev_err(mmc_dev(host->mmc),
"%s: read -ETIMEDOUT\n", __func__);
data->error = -ETIMEDOUT;
} else {
dev_err(mmc_dev(host->mmc), "%s: -EIO\n", __func__);
data->error = -EIO; data->error = -EIO;
} }
} else { } else {
@@ -433,8 +444,6 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)
struct scatterlist *sg; struct scatterlist *sg;
int stat, i; int stat, i;
host->datasize = 0;
host->data = data; host->data = data;
host->datasize = 0; host->datasize = 0;