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

mmc: tmio: refactor handling mrq 

Split handling mrq into a seperate function. We need to call it from
another place soon.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Wolfram Sang 2017-05-19 15:31:51 +02:00 committed by Ulf Hansson
parent 10c998ef97
commit de2a6bb913
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/mmc/host/tmio_mmc_core.c
View File

@ -894,31 +894,10 @@ out:
return ret; return ret;
} }
/* Process requests from the MMC layer */ static void tmio_process_mrq(struct tmio_mmc_host *host, struct mmc_request *mrq)
static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
{ {
struct tmio_mmc_host *host = mmc_priv(mmc);
unsigned long flags;
int ret; int ret;
spin_lock_irqsave(&host->lock, flags);
if (host->mrq) {
pr_debug("request not null\n");
if (IS_ERR(host->mrq)) {
spin_unlock_irqrestore(&host->lock, flags);
mrq->cmd->error = -EAGAIN;
mmc_request_done(mmc, mrq);
return;
}
}
host->last_req_ts = jiffies;
wmb();
host->mrq = mrq;
spin_unlock_irqrestore(&host->lock, flags);
if (mrq->data) { if (mrq->data) {
ret = tmio_mmc_start_data(host, mrq->data); ret = tmio_mmc_start_data(host, mrq->data);
if (ret) if (ret)
@ -937,7 +916,34 @@ fail:
host->force_pio = false; host->force_pio = false;
host->mrq = NULL; host->mrq = NULL;
mrq->cmd->error = ret; mrq->cmd->error = ret;
mmc_request_done(mmc, mrq); mmc_request_done(host->mmc, mrq);
}
/* Process requests from the MMC layer */
static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct tmio_mmc_host *host = mmc_priv(mmc);
unsigned long flags;
spin_lock_irqsave(&host->lock, flags);
if (host->mrq) {
pr_debug("request not null\n");
if (IS_ERR(host->mrq)) {
spin_unlock_irqrestore(&host->lock, flags);
mrq->cmd->error = -EAGAIN;
mmc_request_done(mmc, mrq);
return;
}
}
host->last_req_ts = jiffies;
wmb();
host->mrq = mrq;
spin_unlock_irqrestore(&host->lock, flags);
tmio_process_mrq(host, mrq);
} }
static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)