summaryrefslogtreecommitdiffstats
path: root/drivers/staging/mt7621-mmc
diff options
context:
space:
mode:
authorGeorge Hilliard <thirtythreeforty@gmail.com>2019-03-18 20:20:06 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-20 08:23:18 +0100
commit472033f59139299cab738add0fb3665751d04203 (patch)
tree1b5c409bf58a36b1d88290206887581901d24e45 /drivers/staging/mt7621-mmc
parent64eb131e22bd16f5875e742bdecf653cb4d6c95b (diff)
downloadlinux-472033f59139299cab738add0fb3665751d04203.tar.bz2
staging: mt7621-mmc: Bill the caller for I/O time
When waiting on completions, use the _io variant so the caller is charged as using I/O. This should have no effect on the module's functionality, only improve CPU accounting. Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/mt7621-mmc')
-rw-r--r--drivers/staging/mt7621-mmc/sd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 8b52cd64e575..6f0c939247cb 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -493,7 +493,7 @@ static unsigned int msdc_command_resp(struct msdc_host *host,
//sdr_set_bits(host->base + MSDC_INTEN, wints);
spin_unlock(&host->lock);
- if (!wait_for_completion_timeout(&host->cmd_done, 10 * timeout)) {
+ if (!wait_for_completion_io_timeout(&host->cmd_done, 10 * timeout)) {
dev_err(mmc_dev(host->mmc),
"%d -> XXX CMD<%d> wait_for_completion timeout ARG<0x%.8x>\n",
host->id, opcode, cmd->arg);
@@ -696,7 +696,7 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)
msdc_dma_start(host);
spin_unlock(&host->lock);
- if (!wait_for_completion_timeout(&host->xfer_done, DAT_TIMEOUT)) {
+ if (!wait_for_completion_io_timeout(&host->xfer_done, DAT_TIMEOUT)) {
dev_err(mmc_dev(host->mmc),
"%d -> XXX CMD<%d> wait xfer_done<%d> timeout!!\n",
host->id, cmd->opcode,