mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: George Hilliard <thirtythreeforty@gmail.com>
To: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org, Neil Brown <neil@brown.name>,
	George Hilliard <thirtythreeforty@gmail.com>
Subject: [PATCH 06/10] staging: mt7621-mmc: Bill the caller for I/O time
Date: Tue, 19 Feb 2019 22:17:50 -0700	[thread overview]
Message-ID: <20190220051754.12195-7-thirtythreeforty@gmail.com> (raw)
In-Reply-To: <20190220051754.12195-1-thirtythreeforty@gmail.com>

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>
---
 drivers/staging/mt7621-mmc/sd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 97ed7510e96d..f12f9d6611c9 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -494,7 +494,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);
@@ -697,7 +697,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,
-- 
2.20.1


  parent reply	other threads:[~2019-02-20  5:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-20  5:17 mt7621-mmc driver improvements George Hilliard
2019-02-20  5:17 ` [PATCH 01/10] staging: mt7621-mmc: fix unused variable compiler warning George Hilliard
2019-02-20  5:17 ` [PATCH 02/10] staging: mt7621-mmc: Remove obsolete comments George Hilliard
2019-02-20  5:17 ` [PATCH 03/10] staging: mt7621-mmc: Remove references to nonexistent mt7621_spi_ops George Hilliard
2019-02-20  5:17 ` [PATCH 04/10] staging: mt7621-mmc: Fix warning when reloading module with debug msgs enabled George Hilliard
2019-02-20  5:17 ` [PATCH 05/10] staging: mt7621-mmc: Use pinctrl subsystem to select SDXC pin mode George Hilliard
2019-02-20 11:27   ` Jonas Gorski
2019-02-20  5:17 ` George Hilliard [this message]
2019-02-20  5:17 ` [PATCH 07/10] staging: mt7621-mmc: Initialize completions a single time during probe George Hilliard
2019-02-20  5:17 ` [PATCH 08/10] staging: mt7621-mmc: Check for nonzero number of scatterlist entries George Hilliard
2019-02-20  5:17 ` [PATCH 09/10] staging: mt7621-mmc: Remove redundant host->mmc->f_max write George Hilliard
2019-02-20  5:17 ` [PATCH 10/10] staging: mt7621-mmc: Immediately notify mmc layer of card change detection George Hilliard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190220051754.12195-7-thirtythreeforty@gmail.com \
    --to=thirtythreeforty@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=neil@brown.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®