|
@@ -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,
|
|
{
|
|
{
|
|
if (!desc)
|
|
if (!desc)
|
|
return 0;
|
|
return 0;
|
|
- return pool->hw_addr + (__force dma_addr_t)desc -
|
|
|
|
- (__force dma_addr_t)pool->iomap;
|
|
|
|
|
|
+ return pool->hw_addr + (__force long)desc - (__force long)pool->iomap;
|
|
}
|
|
}
|
|
|
|
|
|
static inline struct cpdma_desc __iomem *
|
|
static inline struct cpdma_desc __iomem *
|