mmc: core: move some code in mmc_start_areq()

"previous" is a better name for the variable storing the previous
asynchronous request, better than the opaque name "data" atleast.
We see that we assign the return status to the returned variable
on all code paths, so we might as well just do that immediately
after calling 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>
(cherry picked from commit 5744d50d2d9e7efdae4b5d13cd71f49256ada6ba)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 7ba01b4..31277be 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -705,7 +705,7 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host,
 {
        enum mmc_blk_status status;
        int start_err = 0;
-       struct mmc_async_req *data = host->areq;
+       struct mmc_async_req *previous = host->areq;
 
        /* Prepare a new request */
        if (areq)
@@ -713,13 +713,12 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host,
 
        /* Finalize previous request */
        status = mmc_finalize_areq(host);
+       if (ret_stat)
+               *ret_stat = status;
 
        /* The previous request is still going on... */
-       if (status == MMC_BLK_NEW_REQUEST) {
-               if (ret_stat)
-                       *ret_stat = status;
+       if (status == MMC_BLK_NEW_REQUEST)
                return NULL;
-       }
 
        /* Fine so far, start the new request! */
        if (status == MMC_BLK_SUCCESS && areq)
@@ -738,9 +737,7 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host,
        else
                host->areq = areq;
 
-       if (ret_stat)
-               *ret_stat = status;
-       return data;
+       return previous;
 }
 EXPORT_SYMBOL(mmc_start_areq);