mmc: core: Factor out debug prints from mmc_start_request()

In preparation to reuse the code for CQE support.

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/core.c b/drivers/mmc/core/core.c
index 926e0fde07d75a441f11ade4c10457bd7dde4ad2..6b063f0c2553a494c53dc718fe5fa38d5d53613f 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -262,26 +262,19 @@ static void __mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
        host->ops->request(host, mrq);
 }
 
-static int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
+static void mmc_mrq_pr_debug(struct mmc_host *host, struct mmc_request *mrq)
 {
-#ifdef CONFIG_MMC_DEBUG
-       unsigned int i, sz;
-       struct scatterlist *sg;
-#endif
-       mmc_retune_hold(host);
-
-       if (mmc_card_removed(host->card))
-               return -ENOMEDIUM;
-
        if (mrq->sbc) {
                pr_debug("<%s: starting CMD%u arg %08x flags %08x>\n",
                         mmc_hostname(host), mrq->sbc->opcode,
                         mrq->sbc->arg, mrq->sbc->flags);
        }
 
-       pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
-                mmc_hostname(host), mrq->cmd->opcode,
-                mrq->cmd->arg, mrq->cmd->flags);
+       if (mrq->cmd) {
+               pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
+                        mmc_hostname(host), mrq->cmd->opcode, mrq->cmd->arg,
+                        mrq->cmd->flags);
+       }
 
        if (mrq->data) {
                pr_debug("%s:     blksz %d blocks %d flags %08x "
@@ -297,6 +290,20 @@ static int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
                         mmc_hostname(host), mrq->stop->opcode,
                         mrq->stop->arg, mrq->stop->flags);
        }
+}
+
+static int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
+{
+#ifdef CONFIG_MMC_DEBUG
+       unsigned int i, sz;
+       struct scatterlist *sg;
+#endif
+       mmc_retune_hold(host);
+
+       if (mmc_card_removed(host->card))
+               return -ENOMEDIUM;
+
+       mmc_mrq_pr_debug(host, mrq);
 
        WARN_ON(!host->claimed);