From: Adrian Hunter <adrian.hunter@intel.com>
To: Chris Ball <cjb@laptop.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>
Subject: [PATCH 2/4] mmc: core: make erase timeout calculation allow for gated clock
Date: Thu, 23 Jun 2011 13:40:27 +0300 [thread overview]
Message-ID: <1308825629-27375-3-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1308825629-27375-1-git-send-email-adrian.hunter@intel.com>
The erase timeout calculation may depend on clock rate
which is zero if the clock is gated, so use
mmc_host_clk_rate() which allows for that case.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/core/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 68091dd..7843efe 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1245,7 +1245,7 @@ static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,
*/
timeout_clks <<= 1;
timeout_us += (timeout_clks * 1000) /
- (card->host->ios.clock / 1000);
+ (mmc_host_clk_rate(card->host) / 1000);
erase_timeout = timeout_us / 1000;
--
1.7.4.4
next prev parent reply other threads:[~2011-06-23 10:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 10:40 [PATCH 0/4] Minor MMC fixes Adrian Hunter
2011-06-23 10:40 ` [PATCH 1/4] mmc: block: switch card to User Data Area when removing the block driver Adrian Hunter
2011-06-23 10:40 ` Adrian Hunter [this message]
2011-06-23 10:40 ` [PATCH 3/4] mmc: queue: append partition subname to queue thread name Adrian Hunter
2011-06-24 2:44 ` Jaehoon Chung
2011-06-23 10:40 ` [PATCH 4/4] mmc: queue: bring discard_granularity/alignment into line with SCSI definitions Adrian Hunter
2011-06-25 22:54 ` [PATCH 0/4] Minor MMC fixes Chris Ball
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=1308825629-27375-3-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=cjb@laptop.org \
--cc=linux-mmc@vger.kernel.org \
/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