[PATCH v2 2/5] mmc: renesas_sdhi: use helpers to access struct scatterlist members

[Wolfram Sang]

From: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>

Instead of directly accessing the members of struct scatterlist use the
helpers mmc_get_dma_dir() and sg_dma_address() in
renesas_sdhi_internal_dmac_start_dma(). Based on previous work by
Masaharu Hayakawa.

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
[rebased to mmc/next]
Signed-off-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
Reviewed-by: Simon Horman <horms+rene...@verge.net.au>
---
 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c 
b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index c8d479375fb6..4f67195cb5f5 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -158,7 +158,6 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host 
*host,
 {
        struct scatterlist *sg = host->sg_ptr;
        u32 dtran_mode = DTRAN_MODE_BUS_WID_TH | DTRAN_MODE_ADDR_MODE;
-       enum dma_data_direction dir;
        int ret;
 
        /* This DMAC cannot handle if sg_len is not 1 */
@@ -170,16 +169,15 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host 
*host,
 
        if (data->flags & MMC_DATA_READ) {
                dtran_mode |= DTRAN_MODE_CH_NUM_CH1;
-               dir = DMA_FROM_DEVICE;
                if (test_bit(SDHI_INTERNAL_DMAC_ONE_RX_ONLY, &global_flags) &&
                    test_and_set_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, 
&global_flags))
                        goto force_pio;
        } else {
                dtran_mode |= DTRAN_MODE_CH_NUM_CH0;
-               dir = DMA_TO_DEVICE;
        }
 
-       ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, dir);
+       ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len,
+                        mmc_get_dma_dir(data));
        if (ret == 0)
                goto force_pio;
 
@@ -189,7 +187,7 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host 
*host,
        renesas_sdhi_internal_dmac_dm_write(host, DM_CM_DTRAN_MODE,
                                            dtran_mode);
        renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR,
-                                           sg->dma_address);
+                                           sg_dma_address(sg));
 
        return;
 
-- 
2.11.0