diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-08 16:23:51 +0100 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-12-10 22:39:48 +0800 |
commit | 75d3f811f33ac994264c2cfb4bbc5220734300a5 (patch) | |
tree | cb404e418459d51d976eb28050d4b9a86a255adc /drivers/crypto/sahara.c | |
parent | e4bc02aced3731776c8828d34e13c02ebdec3088 (diff) | |
download | op-kernel-dev-75d3f811f33ac994264c2cfb4bbc5220734300a5.zip op-kernel-dev-75d3f811f33ac994264c2cfb4bbc5220734300a5.tar.gz |
crypto: sahara - fix 64-bit dma_addr_t compilation
The sahara hardware uses DMA descriptors with 32-bit addresses, but
dma_addr_t is variable size depending on whether we want to support
any devices that use 64-bit DMA addresses in hardware.
This means that the definition of the DMA descriptor structure is wrong,
and we helpfully get a compiler warning about them too:
drivers/crypto/sahara.c:423:372: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
This changes the definition of the sahara_hw_desc and sahara_hw_link
structures to only contain fixed-length members, which is required
to make the driver work on ARM LPAE mode, and avoids most of the
gcc warnings we get.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/sahara.c')
-rw-r--r-- | drivers/crypto/sahara.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index cc738f3..38bf12a 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -130,18 +130,18 @@ #define SAHARA_REG_IDAR 0x20 struct sahara_hw_desc { - u32 hdr; - u32 len1; - dma_addr_t p1; - u32 len2; - dma_addr_t p2; - dma_addr_t next; + u32 hdr; + u32 len1; + u32 p1; + u32 len2; + u32 p2; + u32 next; }; struct sahara_hw_link { - u32 len; - dma_addr_t p; - dma_addr_t next; + u32 len; + u32 p; + u32 next; }; struct sahara_ctx { |