aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/host/mmci.c9
-rw-r--r--drivers/mmc/host/mmci.h2
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index bde170d8f723..db2a358143d6 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -142,9 +142,6 @@ mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
142 host->mrq = NULL; 142 host->mrq = NULL;
143 host->cmd = NULL; 143 host->cmd = NULL;
144 144
145 if (mrq->data)
146 mrq->data->bytes_xfered = host->data_xfered;
147
148 /* 145 /*
149 * Need to drop the host lock here; mmc_request_done may call 146 * Need to drop the host lock here; mmc_request_done may call
150 * back into the driver... 147 * back into the driver...
@@ -202,7 +199,7 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
202 199
203 host->data = data; 200 host->data = data;
204 host->size = data->blksz * data->blocks; 201 host->size = data->blksz * data->blocks;
205 host->data_xfered = 0; 202 data->bytes_xfered = 0;
206 203
207 mmci_init_sg(host, data); 204 mmci_init_sg(host, data);
208 205
@@ -311,7 +308,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
311 success = 0; 308 success = 0;
312 data->error = -EIO; 309 data->error = -EIO;
313 } 310 }
314 host->data_xfered = round_down(success, data->blksz); 311 data->bytes_xfered = round_down(success, data->blksz);
315 } 312 }
316 313
317 if (status & MCI_DATABLOCKEND) 314 if (status & MCI_DATABLOCKEND)
@@ -322,7 +319,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
322 319
323 if (!data->error) 320 if (!data->error)
324 /* The error clause is handled above, success! */ 321 /* The error clause is handled above, success! */
325 host->data_xfered += data->blksz * data->blocks; 322 data->bytes_xfered = data->blksz * data->blocks;
326 323
327 if (!data->stop) { 324 if (!data->stop) {
328 mmci_request_end(host, data->mrq); 325 mmci_request_end(host, data->mrq);
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index c1df7b82d36c..164ce060fc1f 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -161,8 +161,6 @@ struct mmci_host {
161 int gpio_cd_irq; 161 int gpio_cd_irq;
162 bool singleirq; 162 bool singleirq;
163 163
164 unsigned int data_xfered;
165
166 spinlock_t lock; 164 spinlock_t lock;
167 165
168 unsigned int mclk; 166 unsigned int mclk;