]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.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)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Mon, 8 Oct 2018 19:28:26 +0000 (21:28 +0200)
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>
drivers/mtd/spi-nor/cadence-quadspi.c

index 8e714fbfa52123d8ae8ff4c9750d134cc648792d..e24db817154ee73ad1fc0fd9586f4e294fc2886a 100644 (file)
@@ -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_FROM_DEVICE);
 
        return 0;
 }