]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: spi-nor: cadence-quadspi: Use proper enum for dma_[un]map_single
authorNathan Chancellor <natechancellor@gmail.com>
Tue, 25 Sep 2018 07:32:03 +0000 (00:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Nov 2019 07:20:41 +0000 (08:20 +0100)
[ Upstream commit 900f5e0d8c9edc5dacc57873d22aee2ae699a8e1 ]

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'
                                   ~~~~~~~~~~~~~~~~~~~~          ^
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'
                                     ~~~~~~~~~~~~~~~~~~~~~~          ^
2 warnings generated.

Use the proper enums from dma_data_direction to satisfy Clang.

DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2

Link: https://github.com/ClangBuiltLinux/linux/issues/108
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/spi-nor/cadence-quadspi.c

index 0806c7a81c0f7fc887a83f8610d832e88f249f70..04cedd3a2bf6634c5d1f05ef3d27ba302d12935f 100644 (file)
@@ -972,7 +972,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;
@@ -1007,7 +1007,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_FROM_DEVICE);
 
        return ret;
 }