mmc: remove confusing flag

The MMC_DATA_MULTI flag never had a proper definition of what it
means, so remove it and let the drivers check the block count in
the request.

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

4 files changed, 16 insertions, 16 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 9abf29f8435b..ab510689ecde 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -241,7 +241,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                         brq.data.blocks = 1;
 
                 if (brq.data.blocks > 1) {
-                        brq.data.flags |= MMC_DATA_MULTI;
                         brq.mrq.stop = &brq.stop;
                         readcmd = MMC_READ_MULTIPLE_BLOCK;
                         writecmd = MMC_WRITE_MULTIPLE_BLOCK;
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 576d7cb0b3ec..8ec317802347 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -328,7 +328,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
         data = cmd->data;
         if (!data) return;
 
-        if (cmd->data->flags & MMC_DATA_MULTI) {
+        if (cmd->data->blocks > 1) {
                 pr_debug("multiple write : wait for BLKE...\n");
                 at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);
         } else
@@ -439,7 +439,7 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
 
                 if (data->flags & MMC_DATA_STREAM)
                         cmdr |= AT91_MCI_TRTYP_STREAM;
-                if (data->flags & MMC_DATA_MULTI)
+                if (data->blocks > 1)
                         cmdr |= AT91_MCI_TRTYP_MULTIPLE;
         }
         else {
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 49b0367e57c8..92c4d0dfee43 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -186,7 +186,7 @@ static void au1xmmc_tasklet_finish(unsigned long param)
 }
 
 static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
-                                struct mmc_command *cmd, unsigned int flags)
+                                struct mmc_command *cmd, struct mmc_data *data)
 {
         u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
 
@@ -211,16 +211,18 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
                 return -EINVAL;
         }
 
-        if (flags & MMC_DATA_READ) {
-                if (flags & MMC_DATA_MULTI)
-                        mmccmd |= SD_CMD_CT_4;
-                else
-                        mmccmd |= SD_CMD_CT_2;
-        } else if (flags & MMC_DATA_WRITE) {
-                if (flags & MMC_DATA_MULTI)
-                        mmccmd |= SD_CMD_CT_3;
-                else
-                        mmccmd |= SD_CMD_CT_1;
+        if (data) {
+                if (flags & MMC_DATA_READ) {
+                        if (data->blocks > 1)
+                                mmccmd |= SD_CMD_CT_4;
+                        else
+                                mmccmd |= SD_CMD_CT_2;
+                } else if (flags & MMC_DATA_WRITE) {
+                        if (data->blocks > 1)
+                                mmccmd |= SD_CMD_CT_3;
+                        else
+                                mmccmd |= SD_CMD_CT_1;
+                }
         }
 
         au_writel(cmd->arg, HOST_CMDARG(host));
@@ -673,7 +675,7 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
         }
 
         if (!ret)
-                ret = au1xmmc_send_command(host, 0, mrq->cmd, flags);
+                ret = au1xmmc_send_command(host, 0, mrq->cmd, mrq->data);
 
         if (ret) {
                 mrq->cmd->error = ret;
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 2a03f8b9cdfb..29c98ae10aff 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -83,7 +83,6 @@ struct mmc_data {
 #define MMC_DATA_WRITE  (1 << 8)
 #define MMC_DATA_READ   (1 << 9)
 #define MMC_DATA_STREAM (1 << 10)
-#define MMC_DATA_MULTI  (1 << 11)
 
         unsigned int            bytes_xfered;