]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mmc: renesas_sdhi_internal_dmac: remove superfluous WARN
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Wed, 18 Apr 2018 18:21:01 +0000 (20:21 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 2 May 2018 13:08:46 +0000 (15:08 +0200)
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>
drivers/mmc/host/renesas_sdhi_internal_dmac.c

index 240e8a168aa148a593fcb473c3b6dbd558edd19e..2935dd9315d375e61be62ef4dcaaccc7c8be7191 100644 (file)
@@ -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;