mmc: core: add proper be32 annotation

Annotate big endian values correctly and make sparse happy.
In mmc_app_send_scr remove scr function parameter as it was
updating card->raw_scr anyway.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index 9d5824a37586..47056d8d1bac 100644
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -232,14 +232,14 @@ int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca)
         return 0;
 }
 
-int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
+int mmc_app_send_scr(struct mmc_card *card)
 {
         int err;
         struct mmc_request mrq = {};
         struct mmc_command cmd = {};
         struct mmc_data data = {};
         struct scatterlist sg;
-        void *data_buf;
+        __be32 *scr;
 
         /* NOTE: caller guarantees scr is heap-allocated */
 
@@ -250,8 +250,8 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
         /* dma onto stack is unsafe/nonportable, but callers to this
          * routine normally provide temporary on-stack buffers ...
          */
-        data_buf = kmalloc(sizeof(card->raw_scr), GFP_KERNEL);
-        if (data_buf == NULL)
+        scr = kmalloc(sizeof(card->raw_scr), GFP_KERNEL);
+        if (!scr)
                 return -ENOMEM;
 
         mrq.cmd = &cmd;
@@ -267,23 +267,22 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
         data.sg = &sg;
         data.sg_len = 1;
 
-        sg_init_one(&sg, data_buf, 8);
+        sg_init_one(&sg, scr, 8);
 
         mmc_set_data_timeout(&data, card);
 
         mmc_wait_for_req(card->host, &mrq);
 
-        memcpy(scr, data_buf, sizeof(card->raw_scr));
-        kfree(data_buf);
+        card->raw_scr[0] = be32_to_cpu(scr[0]);
+        card->raw_scr[1] = be32_to_cpu(scr[1]);
+
+        kfree(scr);
 
         if (cmd.error)
                 return cmd.error;
         if (data.error)
                 return data.error;
 
-        scr[0] = be32_to_cpu(scr[0]);
-        scr[1] = be32_to_cpu(scr[1]);
-
         return 0;
 }