hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: sdhci: Move some processing to __sdhci_finish_mrq() 

In preparation for removing finish_tasklet, move some processing from
sdhci_request_done() to __sdhci_finish_mrq().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Faiz Abbas <faiz_abbas@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2019-04-05 15:40:18 +03:00 committed by Ulf Hansson
parent 97a1abae46
commit e9a072993d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/sdhci.c
View File

@ -1270,6 +1270,11 @@ static void __sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)
} }
WARN_ON(i >= SDHCI_MAX_MRQS); WARN_ON(i >= SDHCI_MAX_MRQS);
sdhci_del_timer(host, mrq);
if (!sdhci_has_requests(host))
sdhci_led_deactivate(host);
} }
static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq) static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)
@ -2617,8 +2622,6 @@ static bool sdhci_request_done(struct sdhci_host *host)
return true; return true;
} }
sdhci_del_timer(host, mrq);
/* /*
* Always unmap the data buffers if they were mapped by * Always unmap the data buffers if they were mapped by
* sdhci_prepare_data() whenever we finish with a request. * sdhci_prepare_data() whenever we finish with a request.
@ -2700,9 +2703,6 @@ static bool sdhci_request_done(struct sdhci_host *host)
host->pending_reset = false; host->pending_reset = false;
} }
if (!sdhci_has_requests(host))
sdhci_led_deactivate(host);
host->mrqs_done[i] = NULL; host->mrqs_done[i] = NULL;
mmiowb(); mmiowb();