From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from esa6.microchip.iphmx.com ([216.71.154.253]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g4iYe-0007hf-Qz for linux-mtd@lists.infradead.org; Tue, 25 Sep 2018 08:19:04 +0000 Subject: Re: [PATCH] mtd: spi-nor: cadence-quadspi: Use proper enum for dma_unmap_single To: Nathan Chancellor CC: Marek Vasut , David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , , References: <20180921102944.27968-1-natechancellor@gmail.com> <5e1d2e30-764f-f3a9-d0c1-7a6c81f296b7@microchip.com> <20180925073438.GA24068@flashbox> From: Tudor Ambarus Message-ID: <7afdc8a3-61e9-2c06-1ecf-ab62a2466f5e@microchip.com> Date: Tue, 25 Sep 2018 11:18:16 +0300 MIME-Version: 1.0 In-Reply-To: <20180925073438.GA24068@flashbox> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 09/25/2018 10:34 AM, Nathan Chancellor wrote: > On Tue, Sep 25, 2018 at 10:24:04AM +0300, Tudor Ambarus wrote: >> Hi, Nathan, >> >> On 09/21/2018 01:29 PM, Nathan Chancellor wrote: >>> Clang warns when one enumerated type is converted implicitly to another. >>> >>> drivers/mtd/spi-nor/cadence-quadspi.c:962:47: warning: implicit >>> conversion from enumeration type 'enum dma_transfer_direction' to >>> different enumeration type 'enum dma_data_direction' [-Wenum-conversion] >>> dma_dst = dma_map_single(nor->dev, buf, len, DMA_DEV_TO_MEM); >>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ >>> ./include/linux/dma-mapping.h:428:66: note: expanded from macro >>> 'dma_map_single' >>> #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0) >>> ~~~~~~~~~~~~~~~~~~~~ ^ >>> drivers/mtd/spi-nor/cadence-quadspi.c:997:43: warning: implicit >>> conversion from enumeration type 'enum dma_transfer_direction' to >>> different enumeration type 'enum dma_data_direction' [-Wenum-conversion] >>> dma_unmap_single(nor->dev, dma_dst, len, DMA_DEV_TO_MEM); >>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ >>> ./include/linux/dma-mapping.h:429:70: note: expanded from macro >>> 'dma_unmap_single' >>> #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0) >>> ~~~~~~~~~~~~~~~~~~~~~~ ^ >>> 2 warnings generated. >>> >>> Use the proper enums from dma_data_direction to satisfy Clang. >>> >>> DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1 >>> DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2 >>> >>> Link: https://github.com/ClangBuiltLinux/linux/issues/108 >>> Signed-off-by: Nathan Chancellor >>> --- >>> drivers/mtd/spi-nor/cadence-quadspi.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c >>> index 8e714fbfa521..d0e57ac81098 100644 >>> --- a/drivers/mtd/spi-nor/cadence-quadspi.c >>> +++ b/drivers/mtd/spi-nor/cadence-quadspi.c >>> @@ -959,7 +959,7 @@ static int cqspi_direct_read_execute(struct spi_nor *nor, u_char *buf, >>> return 0; >>> } >>> >>> - dma_dst = dma_map_single(nor->dev, buf, len, DMA_DEV_TO_MEM); >>> + dma_dst = dma_map_single(nor->dev, buf, len, DMA_FROM_DEVICE); >>> if (dma_mapping_error(nor->dev, dma_dst)) { >>> dev_err(nor->dev, "dma mapping failed\n"); >>> return -ENOMEM; >>> @@ -994,7 +994,7 @@ static int cqspi_direct_read_execute(struct spi_nor *nor, u_char *buf, >>> } >>> >>> err_unmap: >>> - dma_unmap_single(nor->dev, dma_dst, len, DMA_DEV_TO_MEM); >>> + dma_unmap_single(nor->dev, dma_dst, len, DMA_TO_DEVICE); >> >> Should have used DMA_FROM_DEVICE, as you did above. Otherwise looks good. >> >> Cheers, >> ta > > Thank you very much for catching this, did several of these conversions > back to back and didn't look closely at this. I just sent a v2, I > appreciate the review! I guess I have some problems with my email server. I receive just some of the emails sent to linux-mtd@lists.infradead.org. I haven't received your v2 and I can't add my Reviewed-by tag there. But I checked v2 on https://patchwork.ozlabs.org/patch/974269/, looks good, so: Reviewed-by: Tudor Ambarus for v2! :) Best, ta