Skip to content

Commit cd92d74

Browse files
arndbolofj
authored andcommitted
ARM: orion: don't use using 64-bit DMA masks
clang warns about statically defined DMA masks from the DMA_BIT_MASK macro with length 64: arch/arm/plat-orion/common.c:625:29: error: shift count >= width of type [-Werror,-Wshift-count-overflow] .coherent_dma_mask = DMA_BIT_MASK(64), ^~~~~~~~~~~~~~~~ include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK' #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) The ones in orion shouldn't really be 64 bit masks, so changing them to what the driver can support avoids the warning. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
1 parent fbe8758 commit cd92d74

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/plat-orion/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {
622622
.resource = orion_xor0_shared_resources,
623623
.dev = {
624624
.dma_mask = &orion_xor_dmamask,
625-
.coherent_dma_mask = DMA_BIT_MASK(64),
625+
.coherent_dma_mask = DMA_BIT_MASK(32),
626626
.platform_data = &orion_xor0_pdata,
627627
},
628628
};
@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {
683683
.resource = orion_xor1_shared_resources,
684684
.dev = {
685685
.dma_mask = &orion_xor_dmamask,
686-
.coherent_dma_mask = DMA_BIT_MASK(64),
686+
.coherent_dma_mask = DMA_BIT_MASK(32),
687687
.platform_data = &orion_xor1_pdata,
688688
},
689689
};

0 commit comments

Comments
 (0)