mmc: core: refactor asynchronous request finalization

mmc_wait_for_data_req_done() is called in exactly one place,
and having it spread out is making things hard to oversee.
Factor this function into mmc_finalize_areq().

Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 4c3e23f310f8c1616f50a55f0b1f82f1a8bed93b..d6831dc05d98b8126f548086ac685a55d8460591 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -506,56 +506,6 @@ static int __mmc_start_req(struct mmc_host *host, struct mmc_request *mrq)
        return err;
 }
 
-/*
- * mmc_wait_for_data_req_done() - wait for request completed
- * @host: MMC host to prepare the command.
- * @mrq: MMC request to wait for
- *
- * Blocks MMC context till host controller will ack end of data request
- * execution or new request notification arrives from the block layer.
- * Handles command retries.
- *
- * Returns enum mmc_blk_status after checking errors.
- */
-static enum mmc_blk_status mmc_wait_for_data_req_done(struct mmc_host *host,
-                                                     struct mmc_request *mrq)
-{
-       struct mmc_command *cmd;
-       struct mmc_context_info *context_info = &host->context_info;
-       enum mmc_blk_status status;
-
-       while (1) {
-               wait_event_interruptible(context_info->wait,
-                               (context_info->is_done_rcv ||
-                                context_info->is_new_req));
-
-               if (context_info->is_done_rcv) {
-                       context_info->is_done_rcv = false;
-                       cmd = mrq->cmd;
-
-                       if (!cmd->error || !cmd->retries ||
-                           mmc_card_removed(host->card)) {
-                               status = host->areq->err_check(host->card,
-                                                              host->areq);
-                               break; /* return status */
-                       } else {
-                               mmc_retune_recheck(host);
-                               pr_info("%s: req failed (CMD%u): %d, retrying...\n",
-                                       mmc_hostname(host),
-                                       cmd->opcode, cmd->error);
-                               cmd->retries--;
-                               cmd->error = 0;
-                               __mmc_start_request(host, mrq);
-                               continue; /* wait for done/new event again */
-                       }
-               }
-
-               return MMC_BLK_NEW_REQUEST;
-       }
-       mmc_retune_release(host);
-       return status;
-}
-
 void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq)
 {
        struct mmc_command *cmd;
@@ -660,14 +610,44 @@ static void mmc_post_req(struct mmc_host *host, struct mmc_request *mrq,
  */
 static enum mmc_blk_status mmc_finalize_areq(struct mmc_host *host)
 {
+       struct mmc_context_info *context_info = &host->context_info;
        enum mmc_blk_status status;
 
        if (!host->areq)
                return MMC_BLK_SUCCESS;
 
-       status = mmc_wait_for_data_req_done(host, host->areq->mrq);
-       if (status == MMC_BLK_NEW_REQUEST)
-               return status;
+       while (1) {
+               wait_event_interruptible(context_info->wait,
+                               (context_info->is_done_rcv ||
+                                context_info->is_new_req));
+
+               if (context_info->is_done_rcv) {
+                       struct mmc_command *cmd;
+
+                       context_info->is_done_rcv = false;
+                       cmd = host->areq->mrq->cmd;
+
+                       if (!cmd->error || !cmd->retries ||
+                           mmc_card_removed(host->card)) {
+                               status = host->areq->err_check(host->card,
+                                                              host->areq);
+                               break; /* return status */
+                       } else {
+                               mmc_retune_recheck(host);
+                               pr_info("%s: req failed (CMD%u): %d, retrying...\n",
+                                       mmc_hostname(host),
+                                       cmd->opcode, cmd->error);
+                               cmd->retries--;
+                               cmd->error = 0;
+                               __mmc_start_request(host, host->areq->mrq);
+                               continue; /* wait for done/new event again */
+                       }
+               }
+
+               return MMC_BLK_NEW_REQUEST;
+       }
+
+       mmc_retune_release(host);
 
        /*
         * Check BKOPS urgency for each R1 response