mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
mmc: davinci_mmc: remove the MMC_DATA_STREAM flag
Remove the MMC_DATA_STREAM flag because it isn't used anymore. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
c52f762447
commit
bbb66fcbd5
1 changed files with 3 additions and 12 deletions
|
@ -346,10 +346,6 @@ static void mmc_davinci_start_command(struct mmc_davinci_host *host,
|
|||
if (cmd->data)
|
||||
cmd_reg |= MMCCMD_WDATX;
|
||||
|
||||
/* Setting whether stream or block transfer */
|
||||
if (cmd->flags & MMC_DATA_STREAM)
|
||||
cmd_reg |= MMCCMD_STRMTP;
|
||||
|
||||
/* Setting whether data read or write */
|
||||
if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE)
|
||||
cmd_reg |= MMCCMD_DTRW;
|
||||
|
@ -568,8 +564,7 @@ mmc_davinci_prepare_data(struct mmc_davinci_host *host, struct mmc_request *req)
|
|||
return;
|
||||
}
|
||||
|
||||
dev_dbg(mmc_dev(host->mmc), "%s %s, %d blocks of %d bytes\n",
|
||||
(data->flags & MMC_DATA_STREAM) ? "stream" : "block",
|
||||
dev_dbg(mmc_dev(host->mmc), "%s, %d blocks of %d bytes\n",
|
||||
(data->flags & MMC_DATA_WRITE) ? "write" : "read",
|
||||
data->blocks, data->blksz);
|
||||
dev_dbg(mmc_dev(host->mmc), " DTO %d cycles + %d ns\n",
|
||||
|
@ -584,22 +579,18 @@ mmc_davinci_prepare_data(struct mmc_davinci_host *host, struct mmc_request *req)
|
|||
writel(data->blksz, host->base + DAVINCI_MMCBLEN);
|
||||
|
||||
/* Configure the FIFO */
|
||||
switch (data->flags & MMC_DATA_WRITE) {
|
||||
case MMC_DATA_WRITE:
|
||||
if (data->flags & MMC_DATA_WRITE) {
|
||||
host->data_dir = DAVINCI_MMC_DATADIR_WRITE;
|
||||
writel(fifo_lev | MMCFIFOCTL_FIFODIR_WR | MMCFIFOCTL_FIFORST,
|
||||
host->base + DAVINCI_MMCFIFOCTL);
|
||||
writel(fifo_lev | MMCFIFOCTL_FIFODIR_WR,
|
||||
host->base + DAVINCI_MMCFIFOCTL);
|
||||
break;
|
||||
|
||||
default:
|
||||
} else {
|
||||
host->data_dir = DAVINCI_MMC_DATADIR_READ;
|
||||
writel(fifo_lev | MMCFIFOCTL_FIFODIR_RD | MMCFIFOCTL_FIFORST,
|
||||
host->base + DAVINCI_MMCFIFOCTL);
|
||||
writel(fifo_lev | MMCFIFOCTL_FIFODIR_RD,
|
||||
host->base + DAVINCI_MMCFIFOCTL);
|
||||
break;
|
||||
}
|
||||
|
||||
host->buffer = NULL;
|
||||
|
|
Loading…
Reference in a new issue