Commit a028b435 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: use helpers to access struct scatterlist members 



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: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
[rebased to mmc/next]
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent bb26b841

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+3 −5
Original line number Diff line number Diff line
@@ -157,7 +157,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 */
@@ -169,16 +168,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;
@@ -188,7 +186,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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE