mmc: block: Use local var for mqrq_cur

A subsequent patch will remove 'mq->mqrq_cur'. Prepare for that by
assigning it to a local variable.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index ff3da960c4736147b2c1348681412953508ac49b..d317e5e9b79ac5eb0368972f4981ce872fdd1fc1 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1597,7 +1597,8 @@ static void mmc_blk_rw_cmd_abort(struct mmc_card *card, struct request *req)
  * @mq: the queue with the card and host to restart
  * @req: a new request that want to be started after the current one
  */
-static void mmc_blk_rw_try_restart(struct mmc_queue *mq, struct request *req)
+static void mmc_blk_rw_try_restart(struct mmc_queue *mq, struct request *req,
+                                  struct mmc_queue_req *mqrq)
 {
        if (!req)
                return;
@@ -1611,8 +1612,8 @@ static void mmc_blk_rw_try_restart(struct mmc_queue *mq, struct request *req)
                return;
        }
        /* Else proceed and try to restart the current async request */
-       mmc_blk_rw_rq_prep(mq->mqrq_cur, mq->card, 0, mq);
-       mmc_start_areq(mq->card->host, &mq->mqrq_cur->areq, NULL);
+       mmc_blk_rw_rq_prep(mqrq, mq->card, 0, mq);
+       mmc_start_areq(mq->card->host, &mqrq->areq, NULL);
 }
 
 static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
@@ -1622,6 +1623,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
        struct mmc_blk_request *brq;
        int disable_multi = 0, retry = 0, type, retune_retry_done = 0;
        enum mmc_blk_status status;
+       struct mmc_queue_req *mqrq_cur = mq->mqrq_cur;
        struct mmc_queue_req *mq_rq;
        struct request *old_req;
        struct mmc_async_req *new_areq;
@@ -1645,8 +1647,8 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
                                return;
                        }
 
-                       mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq);
-                       new_areq = &mq->mqrq_cur->areq;
+                       mmc_blk_rw_rq_prep(mqrq_cur, card, 0, mq);
+                       new_areq = &mqrq_cur->areq;
                } else
                        new_areq = NULL;
 
@@ -1700,11 +1702,11 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
                        if (mmc_blk_reset(md, card->host, type)) {
                                if (req_pending)
                                        mmc_blk_rw_cmd_abort(card, old_req);
-                               mmc_blk_rw_try_restart(mq, new_req);
+                               mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                                return;
                        }
                        if (!req_pending) {
-                               mmc_blk_rw_try_restart(mq, new_req);
+                               mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                                return;
                        }
                        break;
@@ -1717,7 +1719,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
                        if (!mmc_blk_reset(md, card->host, type))
                                break;
                        mmc_blk_rw_cmd_abort(card, old_req);
-                       mmc_blk_rw_try_restart(mq, new_req);
+                       mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                        return;
                case MMC_BLK_DATA_ERR: {
                        int err;
@@ -1727,7 +1729,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
                                break;
                        if (err == -ENODEV) {
                                mmc_blk_rw_cmd_abort(card, old_req);
-                               mmc_blk_rw_try_restart(mq, new_req);
+                               mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                                return;
                        }
                        /* Fall through */
@@ -1748,19 +1750,19 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req)
                        req_pending = blk_end_request(old_req, -EIO,
                                                      brq->data.blksz);
                        if (!req_pending) {
-                               mmc_blk_rw_try_restart(mq, new_req);
+                               mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                                return;
                        }
                        break;
                case MMC_BLK_NOMEDIUM:
                        mmc_blk_rw_cmd_abort(card, old_req);
-                       mmc_blk_rw_try_restart(mq, new_req);
+                       mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                        return;
                default:
                        pr_err("%s: Unhandled return value (%d)",
                                        old_req->rq_disk->disk_name, status);
                        mmc_blk_rw_cmd_abort(card, old_req);
-                       mmc_blk_rw_try_restart(mq, new_req);
+                       mmc_blk_rw_try_restart(mq, new_req, mqrq_cur);
                        return;
                }