Commit c767db51 authored by Olof Johansson's avatar Olof Johansson Committed by David S. Miller

net: eth: davinci_cpdma: 64-bit phys/dma_addr_t cleanup

Silences the below warnings when building with ARM_LPAE enabled, which
gives longer dma_addr_t by default:

drivers/net/ethernet/ti/davinci_cpdma.c: In function 'cpdma_desc_pool_create':
drivers/net/ethernet/ti/davinci_cpdma.c:182:3: warning: passing argument 3 of 'dma_alloc_attrs' from incompatible pointer type [enabled by default]
drivers/net/ethernet/ti/davinci_cpdma.c: In function 'desc_phys':
drivers/net/ethernet/ti/davinci_cpdma.c:222:25: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/net/ethernet/ti/davinci_cpdma.c:223:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c45f812f
...@@ -81,7 +81,7 @@ struct cpdma_desc { ...@@ -81,7 +81,7 @@ struct cpdma_desc {
}; };
struct cpdma_desc_pool { struct cpdma_desc_pool {
u32 phys; phys_addr_t phys;
u32 hw_addr; u32 hw_addr;
void __iomem *iomap; /* ioremap map */ void __iomem *iomap; /* ioremap map */
void *cpumap; /* dma_alloc map */ void *cpumap; /* dma_alloc map */
...@@ -219,8 +219,7 @@ static inline dma_addr_t desc_phys(struct cpdma_desc_pool *pool, ...@@ -219,8 +219,7 @@ static inline dma_addr_t desc_phys(struct cpdma_desc_pool *pool,
{ {
if (!desc) if (!desc)
return 0; return 0;
return pool->hw_addr + (__force dma_addr_t)desc - return pool->hw_addr + (__force long)desc - (__force long)pool->iomap;
(__force dma_addr_t)pool->iomap;
} }
static inline struct cpdma_desc __iomem * static inline struct cpdma_desc __iomem *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment