printk: add and use LOGLEVEL_<level> defines for KERN_<LEVEL> equivalents

[deliverable/linux.git] / drivers / mmc / host / mxcmmc.c

diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index ad111422ad55b9dbbf3b83dacd0aaf33c286a204..5316d9b9e7b42f0bb1f5be0f8d16974ae93da041 100644 (file)
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -373,13 +373,9 @@ static void mxcmci_dma_callback(void *data)
        del_timer(&host->watchdog);
 
        stat = mxcmci_readl(host, MMC_REG_STATUS);
-       mxcmci_writel(host, stat & ~STATUS_DATA_TRANS_DONE, MMC_REG_STATUS);
 
        dev_dbg(mmc_dev(host->mmc), "%s: 0x%08x\n", __func__, stat);
 
-       if (stat & STATUS_READ_OP_DONE)
-               mxcmci_writel(host, STATUS_READ_OP_DONE, MMC_REG_STATUS);
-
        mxcmci_data_done(host, stat);
 }
 
@@ -743,10 +739,8 @@ static irqreturn_t mxcmci_irq(int irq, void *devid)
        sdio_irq = (stat & STATUS_SDIO_INT_ACTIVE) && host->use_sdio;
        spin_unlock_irqrestore(&host->lock, flags);
 
-       if (mxcmci_use_dma(host) &&
-           (stat & (STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE)))
-               mxcmci_writel(host, STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE,
-                       MMC_REG_STATUS);
+       if (mxcmci_use_dma(host) && (stat & (STATUS_WRITE_OP_DONE)))
+               mxcmci_writel(host, STATUS_WRITE_OP_DONE, MMC_REG_STATUS);
 
        if (sdio_irq) {
                mxcmci_writel(host, STATUS_SDIO_INT_ACTIVE, MMC_REG_STATUS);
@@ -756,8 +750,7 @@ static irqreturn_t mxcmci_irq(int irq, void *devid)
        if (stat & STATUS_END_CMD_RESP)
                mxcmci_cmd_done(host, stat);
 
-       if (mxcmci_use_dma(host) &&
-                 (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE))) {
+       if (mxcmci_use_dma(host) && (stat & STATUS_WRITE_OP_DONE)) {
                del_timer(&host->watchdog);
                mxcmci_data_done(host, stat);
        }
@@ -1084,12 +1077,14 @@ static int mxcmci_probe(struct platform_device *pdev)
                dat3_card_detect = true;
 
        ret = mmc_regulator_get_supply(mmc);
-       if (ret) {
-               if (pdata && ret != -EPROBE_DEFER)
-                       mmc->ocr_avail = pdata->ocr_avail ? :
-                               MMC_VDD_32_33 | MMC_VDD_33_34;
+       if (ret == -EPROBE_DEFER)
+               goto out_free;
+
+       if (!mmc->ocr_avail) {
+               if (pdata && pdata->ocr_avail)
+                       mmc->ocr_avail = pdata->ocr_avail;
                else
-                       goto out_free;
+                       mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
        }
 
        if (dat3_card_detect)