mmc: android-goldfish: use sg_copy_{from,to}_buffer

This handles highmem pages, and also cleans up the code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index 63d27589cd89d758550c40fb68035c77588e24f0..294de177632c6e25a2024d42f8fbdd926043a80f 100644 (file)
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -217,8 +217,8 @@ static void goldfish_mmc_xfer_done(struct goldfish_mmc_host *host,
                         * We don't really have DMA, so we need
                         * to copy from our platform driver buffer
                         */
-                       uint8_t *dest = (uint8_t *)sg_virt(data->sg);
-                       memcpy(dest, host->virt_base, data->sg->length);
+                       sg_copy_to_buffer(data->sg, 1, host->virt_base,
+                                       data->sg->length);
                }
                host->data->bytes_xfered += data->sg->length;
                dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->sg_len,
@@ -393,8 +393,8 @@ static void goldfish_mmc_prepare_data(struct goldfish_mmc_host *host,
                 * We don't really have DMA, so we need to copy to our
                 * platform driver buffer
                 */
-               const uint8_t *src = (uint8_t *)sg_virt(data->sg);
-               memcpy(host->virt_base, src, data->sg->length);
+               sg_copy_from_buffer(data->sg, 1, host->virt_base,
+                               data->sg->length);
        }
 }