mmc: remove custom error codes

Convert the MMC layer to use standard error codes and not its own,
incompatible values.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 24 insertions, 27 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 20a7d89e01ba..479d6a265dd1 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -481,16 +481,16 @@ static void sdhci_finish_data(struct sdhci_host *host)
          * Controller doesn't count down when in single block mode.
          */
         if (data->blocks == 1)
-                blocks = (data->error == MMC_ERR_NONE) ? 0 : 1;
+                blocks = (data->error == 0) ? 0 : 1;
         else
                 blocks = readw(host->ioaddr + SDHCI_BLOCK_COUNT);
         data->bytes_xfered = data->blksz * (data->blocks - blocks);
 
-        if ((data->error == MMC_ERR_NONE) && blocks) {
+        if (!data->error && blocks) {
                 printk(KERN_ERR "%s: Controller signalled completion even "
                         "though there were blocks left.\n",
                         mmc_hostname(host->mmc));
-                data->error = MMC_ERR_FAILED;
+                data->error = -EIO;
         }
 
         if (data->stop) {
@@ -498,7 +498,7 @@ static void sdhci_finish_data(struct sdhci_host *host)
                  * The controller needs a reset of internal state machines
                  * upon error conditions.
                  */
-                if (data->error != MMC_ERR_NONE) {
+                if (data->error) {
                         sdhci_reset(host, SDHCI_RESET_CMD);
                         sdhci_reset(host, SDHCI_RESET_DATA);
                 }
@@ -533,7 +533,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
                         printk(KERN_ERR "%s: Controller never released "
                                 "inhibit bit(s).\n", mmc_hostname(host->mmc));
                         sdhci_dumpregs(host);
-                        cmd->error = MMC_ERR_FAILED;
+                        cmd->error = -EIO;
                         tasklet_schedule(&host->finish_tasklet);
                         return;
                 }
@@ -554,7 +554,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
         if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) {
                 printk(KERN_ERR "%s: Unsupported response type!\n",
                         mmc_hostname(host->mmc));
-                cmd->error = MMC_ERR_INVALID;
+                cmd->error = -EINVAL;
                 tasklet_schedule(&host->finish_tasklet);
                 return;
         }
@@ -601,7 +601,7 @@ static void sdhci_finish_command(struct sdhci_host *host)
                 }
         }
 
-        host->cmd->error = MMC_ERR_NONE;
+        host->cmd->error = 0;
 
         if (host->data && host->data_early)
                 sdhci_finish_data(host);
@@ -722,7 +722,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         host->mrq = mrq;
 
         if (!(readl(host->ioaddr + SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
-                host->mrq->cmd->error = MMC_ERR_TIMEOUT;
+                host->mrq->cmd->error = -ENOMEDIUM;
                 tasklet_schedule(&host->finish_tasklet);
         } else
                 sdhci_send_command(host, mrq->cmd);
@@ -831,7 +831,7 @@ static void sdhci_tasklet_card(unsigned long param)
                         sdhci_reset(host, SDHCI_RESET_CMD);
                         sdhci_reset(host, SDHCI_RESET_DATA);
 
-                        host->mrq->cmd->error = MMC_ERR_FAILED;
+                        host->mrq->cmd->error = -ENOMEDIUM;
                         tasklet_schedule(&host->finish_tasklet);
                 }
         }
@@ -859,9 +859,9 @@ static void sdhci_tasklet_finish(unsigned long param)
          * The controller needs a reset of internal state machines
          * upon error conditions.
          */
-        if ((mrq->cmd->error != MMC_ERR_NONE) ||
-                (mrq->data && ((mrq->data->error != MMC_ERR_NONE) ||
-                (mrq->data->stop && (mrq->data->stop->error != MMC_ERR_NONE))))) {
+        if (mrq->cmd->error ||
+                (mrq->data && (mrq->data->error ||
+                (mrq->data->stop && mrq->data->stop->error)))) {
 
                 /* Some controllers need this kick or reset won't work here */
                 if (host->chip->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET) {
@@ -906,13 +906,13 @@ static void sdhci_timeout_timer(unsigned long data)
                 sdhci_dumpregs(host);
 
                 if (host->data) {
-                        host->data->error = MMC_ERR_TIMEOUT;
+                        host->data->error = -ETIMEDOUT;
                         sdhci_finish_data(host);
                 } else {
                         if (host->cmd)
-                                host->cmd->error = MMC_ERR_TIMEOUT;
+                                host->cmd->error = -ETIMEDOUT;
                         else
-                                host->mrq->cmd->error = MMC_ERR_TIMEOUT;
+                                host->mrq->cmd->error = -ETIMEDOUT;
 
                         tasklet_schedule(&host->finish_tasklet);
                 }
@@ -941,13 +941,12 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)
         }
 
         if (intmask & SDHCI_INT_TIMEOUT)
-                host->cmd->error = MMC_ERR_TIMEOUT;
-        else if (intmask & SDHCI_INT_CRC)
-                host->cmd->error = MMC_ERR_BADCRC;
-        else if (intmask & (SDHCI_INT_END_BIT | SDHCI_INT_INDEX))
-                host->cmd->error = MMC_ERR_FAILED;
+                host->cmd->error = -ETIMEDOUT;
+        else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
+                        SDHCI_INT_INDEX))
+                host->cmd->error = -EILSEQ;
 
-        if (host->cmd->error != MMC_ERR_NONE)
+        if (host->cmd->error)
                 tasklet_schedule(&host->finish_tasklet);
         else if (intmask & SDHCI_INT_RESPONSE)
                 sdhci_finish_command(host);
@@ -974,13 +973,11 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
         }
 
         if (intmask & SDHCI_INT_DATA_TIMEOUT)
-                host->data->error = MMC_ERR_TIMEOUT;
-        else if (intmask & SDHCI_INT_DATA_CRC)
-                host->data->error = MMC_ERR_BADCRC;
-        else if (intmask & SDHCI_INT_DATA_END_BIT)
-                host->data->error = MMC_ERR_FAILED;
+                host->data->error = -ETIMEDOUT;
+        else if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_END_BIT))
+                host->data->error = -EILSEQ;
 
-        if (host->data->error != MMC_ERR_NONE)
+        if (host->data->error)
                 sdhci_finish_data(host);
         else {
                 if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))