diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-25 11:50:42 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-07 18:19:42 -0400 |
| commit | cd92d74d67c811dc22544430b9ac3029f5bd64c5 (patch) | |
| tree | ac715e9312b4365f5b2cd052a673b92918249c52 | |
| parent | fbe8758f931ff5468aaeb4b304fc3edb70c908d6 (diff) | |
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 <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/plat-orion/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index a6c81ce00f52..8647cb80a93b 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
| @@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = { | |||
| 622 | .resource = orion_xor0_shared_resources, | 622 | .resource = orion_xor0_shared_resources, |
| 623 | .dev = { | 623 | .dev = { |
| 624 | .dma_mask = &orion_xor_dmamask, | 624 | .dma_mask = &orion_xor_dmamask, |
| 625 | .coherent_dma_mask = DMA_BIT_MASK(64), | 625 | .coherent_dma_mask = DMA_BIT_MASK(32), |
| 626 | .platform_data = &orion_xor0_pdata, | 626 | .platform_data = &orion_xor0_pdata, |
| 627 | }, | 627 | }, |
| 628 | }; | 628 | }; |
| @@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = { | |||
| 683 | .resource = orion_xor1_shared_resources, | 683 | .resource = orion_xor1_shared_resources, |
| 684 | .dev = { | 684 | .dev = { |
| 685 | .dma_mask = &orion_xor_dmamask, | 685 | .dma_mask = &orion_xor_dmamask, |
| 686 | .coherent_dma_mask = DMA_BIT_MASK(64), | 686 | .coherent_dma_mask = DMA_BIT_MASK(32), |
| 687 | .platform_data = &orion_xor1_pdata, | 687 | .platform_data = &orion_xor1_pdata, |
| 688 | }, | 688 | }, |
| 689 | }; | 689 | }; |
