mmc: core: Don't handle buffers on stack while fetching CXD registers

Due to previous patches, all callers of mmc_send_cxd_data() now
allocates their buffers from the heap. This enables us to simplify
mmc_send_cxd_data() by removing the support of handling buffers, which
are allocated from the stack.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 9a6181bf0c063fff29ca52601df264a2b1a8f344..e04008f6fc246f5d0491f89a81f985b0f4201207 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -264,20 +264,6 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
        struct mmc_command cmd = {0};
        struct mmc_data data = {0};
        struct scatterlist sg;
-       void *data_buf;
-       int is_on_stack;
-
-       is_on_stack = object_is_on_stack(buf);
-       if (is_on_stack) {
-               /*
-                * dma onto stack is unsafe/nonportable, but callers to this
-                * routine normally provide temporary on-stack buffers ...
-                */
-               data_buf = kmalloc(len, GFP_KERNEL);
-               if (!data_buf)
-                       return -ENOMEM;
-       } else
-               data_buf = buf;
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -298,7 +284,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
        data.sg = &sg;
        data.sg_len = 1;
 
-       sg_init_one(&sg, data_buf, len);
+       sg_init_one(&sg, buf, len);
 
        if (opcode == MMC_SEND_CSD || opcode == MMC_SEND_CID) {
                /*
@@ -312,11 +298,6 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
 
        mmc_wait_for_req(host, &mrq);
 
-       if (is_on_stack) {
-               memcpy(buf, data_buf, len);
-               kfree(data_buf);
-       }
-
        if (cmd.error)
                return cmd.error;
        if (data.error)