| From 893b5843ba6298344789d6af977d956e021c0e34 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Wed, 18 Apr 2018 20:21:01 +0200 |
| Subject: [PATCH 1220/1795] mmc: renesas_sdhi_internal_dmac: remove superfluous |
| WARN |
| |
| The WARN can never trigger because we limited the max_seg number in |
| renesas_sdhi_of_data already. Remove it and update the comment. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit ebca50dfae525341c48c2f69798667352318549e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c |
| index b6774bae9beb..7c2c8a7d020e 100644 |
| --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c |
| +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c |
| @@ -91,7 +91,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { |
| .scc_offset = 0x1000, |
| .taps = rcar_gen3_scc_taps, |
| .taps_num = ARRAY_SIZE(rcar_gen3_scc_taps), |
| - /* Gen3 SDHI DMAC can handle 0xffffffff blk count, but seg = 1 */ |
| + /* DMAC can handle 0xffffffff blk count but only 1 segment */ |
| .max_blk_count = 0xffffffff, |
| .max_segs = 1, |
| }; |
| @@ -158,9 +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; |
| |
| - /* This DMAC cannot handle if sg_len is not 1 */ |
| - WARN_ON(host->sg_len > 1); |
| - |
| if (!dma_map_sg(&host->pdev->dev, sg, host->sg_len, |
| mmc_get_dma_dir(data))) |
| goto force_pio; |
| -- |
| 2.19.0 |
| |
