mmc: sdhci: Tidy reading 136-bit responses

Read each register only once and move the code to a separate function so
that it is not jammed against the 80 column margin.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5afc72f09a2a4b040f66b3295f9d5ccc9a424638..1cea35d8bc79eeaf3c1fa00bce134047db216424 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1173,24 +1173,32 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
 }
 EXPORT_SYMBOL_GPL(sdhci_send_command);
 
+static void sdhci_read_rsp_136(struct sdhci_host *host, struct mmc_command *cmd)
+{
+       int i, reg;
+
+       for (i = 0; i < 4; i++) {
+               reg = SDHCI_RESPONSE + (3 - i) * 4;
+               cmd->resp[i] = sdhci_readl(host, reg);
+       }
+
+       /* CRC is stripped so we need to do some shifting */
+       for (i = 0; i < 4; i++) {
+               cmd->resp[i] <<= 8;
+               if (i != 3)
+                       cmd->resp[i] |= cmd->resp[i + 1] >> 24;
+       }
+}
+
 static void sdhci_finish_command(struct sdhci_host *host)
 {
        struct mmc_command *cmd = host->cmd;
-       int i;
 
        host->cmd = NULL;
 
        if (cmd->flags & MMC_RSP_PRESENT) {
                if (cmd->flags & MMC_RSP_136) {
-                       /* CRC is stripped so we need to do some shifting. */
-                       for (i = 0;i < 4;i++) {
-                               cmd->resp[i] = sdhci_readl(host,
-                                       SDHCI_RESPONSE + (3-i)*4) << 8;
-                               if (i != 3)
-                                       cmd->resp[i] |=
-                                               sdhci_readb(host,
-                                               SDHCI_RESPONSE + (3-i)*4-1);
-                       }
+                       sdhci_read_rsp_136(host, cmd);
                } else {
                        cmd->resp[0] = sdhci_readl(host, SDHCI_RESPONSE);
                }