* [PATCH 01/12] mmc: core: use the defined function to check whether card is removable
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 02/12] mmc: atmel-mci: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (11 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
In linux/mmc/host.h, mmc_card_is_removable() is already defined.
There is no reason that it doesn't use.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/core/core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index f95d41f..9da9b60 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2532,7 +2532,7 @@ int mmc_detect_card_removed(struct mmc_host *host)
if (!card)
return 1;
- if (host->caps & MMC_CAP_NONREMOVABLE)
+ if (!mmc_card_is_removable(host))
return 0;
ret = mmc_card_removed(card);
@@ -2570,7 +2570,7 @@ void mmc_rescan(struct work_struct *work)
return;
/* If there is a non-removable card registered, only scan once */
- if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
+ if (!mmc_card_is_removable(host) && host->rescan_entered)
return;
host->rescan_entered = 1;
@@ -2587,8 +2587,7 @@ void mmc_rescan(struct work_struct *work)
* if there is a _removable_ card registered, check whether it is
* still present
*/
- if (host->bus_ops && !host->bus_dead
- && !(host->caps & MMC_CAP_NONREMOVABLE))
+ if (host->bus_ops && !host->bus_dead && mmc_card_is_removable(host))
host->bus_ops->detect(host);
host->detect_change = 0;
@@ -2613,7 +2612,7 @@ void mmc_rescan(struct work_struct *work)
mmc_bus_put(host);
mmc_claim_host(host);
- if (!(host->caps & MMC_CAP_NONREMOVABLE) && host->ops->get_cd &&
+ if (mmc_card_is_removable(host) && host->ops->get_cd &&
host->ops->get_cd(host) == 0) {
mmc_power_off(host);
mmc_release_host(host);
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/12] mmc: atmel-mci: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
2016-01-29 4:06 ` [PATCH 01/12] mmc: core: use the defined function to check whether card is removable Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 03/12] mmc: bfin_sdh: " Jaehoon Chung
` (10 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
drivers/mmc/host/atmel-mci.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 851ccd9..7f9d3de 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -848,9 +848,7 @@ static u32 atmci_prepare_command(struct mmc_host *mmc,
if (cmd->opcode == SD_IO_RW_EXTENDED) {
cmdr |= ATMCI_CMDR_SDIO_BLOCK;
} else {
- if (data->flags & MMC_DATA_STREAM)
- cmdr |= ATMCI_CMDR_STREAM;
- else if (data->blocks > 1)
+ if (data->blocks > 1)
cmdr |= ATMCI_CMDR_MULTI_BLOCK;
else
cmdr |= ATMCI_CMDR_BLOCK;
@@ -1371,10 +1369,7 @@ static void atmci_start_request(struct atmel_mci *host,
host->stop_cmdr |= ATMCI_CMDR_STOP_XFER;
if (!(data->flags & MMC_DATA_WRITE))
host->stop_cmdr |= ATMCI_CMDR_TRDIR_READ;
- if (data->flags & MMC_DATA_STREAM)
- host->stop_cmdr |= ATMCI_CMDR_STREAM;
- else
- host->stop_cmdr |= ATMCI_CMDR_MULTI_BLOCK;
+ host->stop_cmdr |= ATMCI_CMDR_MULTI_BLOCK;
}
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/12] mmc: bfin_sdh: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
2016-01-29 4:06 ` [PATCH 01/12] mmc: core: use the defined function to check whether card is removable Jaehoon Chung
2016-01-29 4:06 ` [PATCH 02/12] mmc: atmel-mci: remove the MMC_DATA_STREAM flag Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 04/12] mmc: davinci_mmc: " Jaehoon Chung
` (9 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/bfin_sdh.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 2b7f37e..526231e 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -126,9 +126,6 @@ static int sdh_setup_data(struct sdh_host *host, struct mmc_data *data)
length = data->blksz * data->blocks;
bfin_write_SDH_DATA_LGTH(length);
- if (data->flags & MMC_DATA_STREAM)
- data_ctl |= DTX_MODE;
-
if (data->flags & MMC_DATA_READ)
data_ctl |= DTX_DIR;
/* Only supports power-of-2 block size */
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/12] mmc: davinci_mmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (2 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 03/12] mmc: bfin_sdh: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 05/12] mmc: dw_mmc: " Jaehoon Chung
` (8 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/davinci_mmc.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index ea2a2eb..693144e 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -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;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/12] mmc: dw_mmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (3 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 04/12] mmc: davinci_mmc: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 06/12] mmc: jz4740_mmc: " Jaehoon Chung
` (7 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/dw_mmc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 7128351..40fcf9e 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -290,8 +290,6 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
data = cmd->data;
if (data) {
cmdr |= SDMMC_CMD_DAT_EXP;
- if (data->flags & MMC_DATA_STREAM)
- cmdr |= SDMMC_CMD_STRM_MODE;
if (data->flags & MMC_DATA_WRITE)
cmdr |= SDMMC_CMD_DAT_WR;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/12] mmc: jz4740_mmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (4 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 05/12] mmc: dw_mmc: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 07/12] mmc: mxcmmc: " Jaehoon Chung
` (6 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/jz4740_mmc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index 76e8bce..03ddf0e 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -660,8 +660,6 @@ static void jz4740_mmc_send_command(struct jz4740_mmc_host *host,
cmdat |= JZ_MMC_CMDAT_DATA_EN;
if (cmd->data->flags & MMC_DATA_WRITE)
cmdat |= JZ_MMC_CMDAT_WRITE;
- if (cmd->data->flags & MMC_DATA_STREAM)
- cmdat |= JZ_MMC_CMDAT_STREAM;
if (host->use_dma)
cmdat |= JZ_MMC_CMDAT_DMA_EN;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/12] mmc: mxcmmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (5 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 06/12] mmc: jz4740_mmc: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 08/12] mmc: pxamci: " Jaehoon Chung
` (5 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/mxcmmc.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index d110f9e..3d1ea5e 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -307,9 +307,6 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
enum dma_transfer_direction slave_dirn;
int i, nents;
- if (data->flags & MMC_DATA_STREAM)
- nob = 0xffff;
-
host->data = data;
data->bytes_xfered = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/12] mmc: pxamci: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (6 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 07/12] mmc: mxcmmc: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 9:25 ` Robert Jarzmik
2016-01-29 4:06 ` [PATCH 09/12] mmc: s3cmci: " Jaehoon Chung
` (4 subsequent siblings)
12 siblings, 1 reply; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/pxamci.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index ce08896..4285d3a 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -191,9 +191,6 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
host->data = data;
- if (data->flags & MMC_DATA_STREAM)
- nob = 0xffff;
-
writel(nob, host->base + MMC_NOB);
writel(data->blksz, host->base + MMC_BLKLEN);
@@ -443,9 +440,6 @@ static void pxamci_request(struct mmc_host *mmc, struct mmc_request *mrq)
cmdat |= CMDAT_DATAEN | CMDAT_DMAEN;
if (mrq->data->flags & MMC_DATA_WRITE)
cmdat |= CMDAT_WRITE;
-
- if (mrq->data->flags & MMC_DATA_STREAM)
- cmdat |= CMDAT_STREAM;
}
pxamci_start_cmd(host, mrq->cmd, cmdat);
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/12] mmc: s3cmci: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (7 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 08/12] mmc: pxamci: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 10/12] mmc: sunxi-mmc: " Jaehoon Chung
` (3 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/s3cmci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 6291d50..39814f3 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1014,8 +1014,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
if (host->bus_width == MMC_BUS_WIDTH_4)
dcon |= S3C2410_SDIDCON_WIDEBUS;
- if (!(data->flags & MMC_DATA_STREAM))
- dcon |= S3C2410_SDIDCON_BLOCKMODE;
+ dcon |= S3C2410_SDIDCON_BLOCKMODE;
if (data->flags & MMC_DATA_WRITE) {
dcon |= S3C2410_SDIDCON_TXAFTERRESP;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/12] mmc: sunxi-mmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (8 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 09/12] mmc: s3cmci: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 11/12] mmc: core: " Jaehoon Chung
` (2 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
Remove the MMC_DATA_STREAM flag because it doesn't use anymore.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/host/sunxi-mmc.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 83de82b..d61c58e 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -815,11 +815,6 @@ static void sunxi_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
if ((cmd->flags & MMC_CMD_MASK) == MMC_CMD_ADTC) {
cmd_val |= SDXC_DATA_EXPIRE | SDXC_WAIT_PRE_OVER;
- if (cmd->data->flags & MMC_DATA_STREAM) {
- imask |= SDXC_AUTO_COMMAND_DONE;
- cmd_val |= SDXC_SEQUENCE_MODE |
- SDXC_SEND_AUTO_STOP;
- }
if (cmd->data->stop) {
imask |= SDXC_AUTO_COMMAND_DONE;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 11/12] mmc: core: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (9 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 10/12] mmc: sunxi-mmc: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:06 ` [PATCH 12/12] mmc: block: don't use the OR operation for flag of data Jaehoon Chung
2016-01-29 4:28 ` [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
It's not set to MMC_DATA_STREAM anywhere.
It seems that it had been used with CMD11/CMD20.
But according to Spec, CMD11/CMD20 are obsolete command.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
include/linux/mmc/core.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 37967b6..b01e77d 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -113,7 +113,6 @@ struct mmc_data {
#define MMC_DATA_WRITE (1 << 8)
#define MMC_DATA_READ (1 << 9)
-#define MMC_DATA_STREAM (1 << 10)
unsigned int bytes_xfered;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 12/12] mmc: block: don't use the OR operation for flag of data
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (10 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 11/12] mmc: core: " Jaehoon Chung
@ 2016-01-29 4:06 ` Jaehoon Chung
2016-01-29 4:28 ` [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:06 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik, Jaehoon Chung
After removed the MMC_DATA_STREAM, only two flags are remained.
(MMC_DATA_READ and MMC_DATA_WRITE)
The flags of READ and WRITE can't be used together.
That's why it doesn't need to use "OR' operation.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
drivers/mmc/card/block.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 5914263..e7449cb 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1525,13 +1525,13 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
}
if (rq_data_dir(req) == READ) {
brq->cmd.opcode = readcmd;
- brq->data.flags |= MMC_DATA_READ;
+ brq->data.flags = MMC_DATA_READ;
if (brq->mrq.stop)
brq->stop.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 |
MMC_CMD_AC;
} else {
brq->cmd.opcode = writecmd;
- brq->data.flags |= MMC_DATA_WRITE;
+ brq->data.flags = MMC_DATA_WRITE;
if (brq->mrq.stop)
brq->stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B |
MMC_CMD_AC;
@@ -1800,7 +1800,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
brq->data.blksz = 512;
brq->data.blocks = packed->blocks + hdr_blocks;
- brq->data.flags |= MMC_DATA_WRITE;
+ brq->data.flags = MMC_DATA_WRITE;
brq->stop.opcode = MMC_STOP_TRANSMISSION;
brq->stop.arg = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag
2016-01-29 4:05 [PATCH 00/12] mmc: remove the MMC_DATA_STREAM flag Jaehoon Chung
` (11 preceding siblings ...)
2016-01-29 4:06 ` [PATCH 12/12] mmc: block: don't use the OR operation for flag of data Jaehoon Chung
@ 2016-01-29 4:28 ` Jaehoon Chung
12 siblings, 0 replies; 16+ messages in thread
From: Jaehoon Chung @ 2016-01-29 4:28 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson, sonic.zhang, robert.jarzmik
Hi, All.
Sorry! I sent wrong patchset..There is other patch.. :(
I will resend the correct patchset.
Discard this patchset...Sorry!
Best Regards,
Jaehoon Chung
On 01/29/2016 01:05 PM, Jaehoon Chung wrote:
> This patchset is related to remove the MMC_DATA_STREAM.
> It's not set to MMC_DATS_STREAM anywhere.
> This flag had been used with CDM11 and CMD20.
> But CMD11/CMD20 have become obsolete.
> To reduce the confusion, removed the unnecessary flag.
>
> Jaehoon Chung (12):
> mmc: core: use the defined function to check whether card is removable
> mmc: atmel-mci: remove the MMC_DATA_STREAM flag
> mmc: bfin_sdh: remove the MMC_DATA_STREAM flag
> mmc: davinci_mmc: remove the MMC_DATA_STREAM flag
> mmc: dw_mmc: remove the MMC_DATA_STREAM flag
> mmc: jz4740_mmc: remove the MMC_DATA_STREAM flag
> mmc: mxcmmc: remove the MMC_DATA_STREAM flag
> mmc: pxamci: remove the MMC_DATA_STREAM flag
> mmc: s3cmci: remove the MMC_DATA_STREAM flag
> mmc: sunxi-mmc: remove the MMC_DATA_STREAM flag
> mmc: core: remove the MMC_DATA_STREAM flag
> mmc: block: don't use the OR operation for flag of data
>
> drivers/mmc/card/block.c | 6 +++---
> drivers/mmc/core/core.c | 9 ++++-----
> drivers/mmc/host/atmel-mci.c | 9 ++-------
> drivers/mmc/host/bfin_sdh.c | 3 ---
> drivers/mmc/host/davinci_mmc.c | 15 +++------------
> drivers/mmc/host/dw_mmc.c | 2 --
> drivers/mmc/host/jz4740_mmc.c | 2 --
> drivers/mmc/host/mxcmmc.c | 3 ---
> drivers/mmc/host/pxamci.c | 6 ------
> drivers/mmc/host/s3cmci.c | 3 +--
> drivers/mmc/host/sunxi-mmc.c | 5 -----
> include/linux/mmc/core.h | 1 -
> 12 files changed, 13 insertions(+), 51 deletions(-)
>
^ permalink raw reply [flat|nested] 16+ messages in thread