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

mmc: remove confusing flag

Browse Source 
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>
This commit is contained in:
Pierre Ossman
2007-07-24 21:11:47 +02:00
parent 255d01af9a
commit be0192aae1
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mmc/card/block.c
View File

@@ -241,7 +241,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
brq.data.blocks = 1; brq.data.blocks = 1;
if (brq.data.blocks > 1) { if (brq.data.blocks > 1) {
brq.data.flags |= MMC_DATA_MULTI;
brq.mrq.stop = &brq.stop; brq.mrq.stop = &brq.stop;
readcmd = MMC_READ_MULTIPLE_BLOCK; readcmd = MMC_READ_MULTIPLE_BLOCK;
writecmd = MMC_WRITE_MULTIPLE_BLOCK; writecmd = MMC_WRITE_MULTIPLE_BLOCK;

4
drivers/mmc/host/at91_mci.c
View File

@@ -328,7 +328,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
data = cmd->data; data = cmd->data;
if (!data) return; if (!data) return;
if (cmd->data->flags & MMC_DATA_MULTI) { if (cmd->data->blocks > 1) {
pr_debug("multiple write : wait for BLKE...\n"); pr_debug("multiple write : wait for BLKE...\n");
at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE); at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);
} else } else
@@ -439,7 +439,7 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
if (data->flags & MMC_DATA_STREAM) if (data->flags & MMC_DATA_STREAM)
cmdr |= AT91_MCI_TRTYP_STREAM; cmdr |= AT91_MCI_TRTYP_STREAM;
if (data->flags & MMC_DATA_MULTI) if (data->blocks > 1)
cmdr |= AT91_MCI_TRTYP_MULTIPLE; cmdr |= AT91_MCI_TRTYP_MULTIPLE;
} }
else { else {

26
drivers/mmc/host/au1xmmc.c
View File

@@ -186,7 +186,7 @@ static void au1xmmc_tasklet_finish(unsigned long param)
} }
static int au1xmmc_send_command(struct au1xmmc_host *host, int wait, 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); 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; return -EINVAL;
} }
if (flags & MMC_DATA_READ) { if (data) {
if (flags & MMC_DATA_MULTI) if (flags & MMC_DATA_READ) {
mmccmd |= SD_CMD_CT_4; if (data->blocks > 1)
else mmccmd |= SD_CMD_CT_4;
mmccmd |= SD_CMD_CT_2; else
} else if (flags & MMC_DATA_WRITE) { mmccmd |= SD_CMD_CT_2;
if (flags & MMC_DATA_MULTI) } else if (flags & MMC_DATA_WRITE) {
mmccmd |= SD_CMD_CT_3; if (data->blocks > 1)
else mmccmd |= SD_CMD_CT_3;
mmccmd |= SD_CMD_CT_1; else
mmccmd |= SD_CMD_CT_1;
}
} }
au_writel(cmd->arg, HOST_CMDARG(host)); 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) if (!ret)
ret = au1xmmc_send_command(host, 0, mrq->cmd, flags); ret = au1xmmc_send_command(host, 0, mrq->cmd, mrq->data);
if (ret) { if (ret) {
mrq->cmd->error = ret; mrq->cmd->error = ret;

1
include/linux/mmc/core.h
View File

@@ -83,7 +83,6 @@ struct mmc_data {
#define MMC_DATA_WRITE (1 << 8) #define MMC_DATA_WRITE (1 << 8)
#define MMC_DATA_READ (1 << 9) #define MMC_DATA_READ (1 << 9)
#define MMC_DATA_STREAM (1 << 10) #define MMC_DATA_STREAM (1 << 10)
#define MMC_DATA_MULTI (1 << 11)
unsigned int bytes_xfered; unsigned int bytes_xfered;