android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: block: Make card_busy_detect() a bit more generic

Browse Source 
To prepare for more users of card_busy_detect(), let's drop the struct
request * as an in-parameter and convert to log the error message via
dev_err() instead of pr_err().

Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Chaotian Jing 2019-09-05 15:53:17 +08:00 committed by Ulf Hansson
parent 22dc132d54
commit 3869468e0c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mmc/core/block.c
View File

@ -981,7 +981,7 @@ static inline bool mmc_blk_in_tran_state(u32 status)
} }
static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
struct request *req, u32 *resp_errs) u32 *resp_errs)
{ {
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
int err = 0; int err = 0;
@ -992,8 +992,8 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
err = __mmc_send_status(card, &status, 5); err = __mmc_send_status(card, &status, 5);
if (err) { if (err) {
pr_err("%s: error %d requesting status\n", dev_err(mmc_dev(card->host),
req->rq_disk->disk_name, err); "error %d requesting status\n", err);
return err; return err;
} }
@ -1006,9 +1006,9 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
* leaves the program state. * leaves the program state.
*/ */
if (done) { if (done) {
pr_err("%s: Card stuck in wrong state! %s %s status: %#x\n", dev_err(mmc_dev(card->host),
mmc_hostname(card->host), "Card stuck in wrong state! %s status: %#x\n",
req->rq_disk->disk_name, __func__, status); __func__, status);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -1671,7 +1671,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req)
mmc_blk_send_stop(card, timeout); mmc_blk_send_stop(card, timeout);
err = card_busy_detect(card, timeout, req, NULL); err = card_busy_detect(card, timeout, NULL);
mmc_retune_release(card->host); mmc_retune_release(card->host);
@ -1895,7 +1895,7 @@ static int mmc_blk_card_busy(struct mmc_card *card, struct request *req)
if (mmc_host_is_spi(card->host) || rq_data_dir(req) == READ) if (mmc_host_is_spi(card->host) || rq_data_dir(req) == READ)
return 0; return 0;
err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, req, &status); err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, &status);
/* /*
* Do not assume data transferred correctly if there are any error bits * Do not assume data transferred correctly if there are any error bits