diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-07-13 11:09:33 +0300 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@linux.intel.com> | 2012-07-16 12:03:07 +0530 |
| commit | f8609c2b528331c38293bb8082a91701256d3fc1 (patch) | |
| tree | 912e86414141bd89a4167fe86d2b4322b5971860 /drivers/dma | |
| parent | dw_dmac: mark dwc_dump_lli inline (diff) | |
| download | linux-dev-f8609c2b528331c38293bb8082a91701256d3fc1.tar.xz linux-dev-f8609c2b528331c38293bb8082a91701256d3fc1.zip | |
dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
Use 'u32' for the LLI structure members, which are defined by hardware to be
32-bit. dma_addr_t is much more vague about its actual size.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dw_dmac.c | 7 | ||||
| -rw-r--r-- | drivers/dma/dw_dmac_regs.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 600634982b4c..57beb5c8e3fd 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@ -414,11 +414,8 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc) static inline void dwc_dump_lli(struct dw_dma_chan *dwc, struct dw_lli *lli) { dev_printk(KERN_CRIT, chan2dev(&dwc->chan), - " desc: s0x%llx d0x%llx l0x%llx c0x%x:%x\n", - (unsigned long long)lli->sar, - (unsigned long long)lli->dar, - (unsigned long long)lli->llp, - lli->ctlhi, lli->ctllo); + " desc: s0x%x d0x%x l0x%x c0x%x:%x\n", + lli->sar, lli->dar, lli->llp, lli->ctlhi, lli->ctllo); } static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc) diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h index e248481ad5f1..50830bee087a 100644 --- a/drivers/dma/dw_dmac_regs.h +++ b/drivers/dma/dw_dmac_regs.h @@ -219,9 +219,9 @@ static inline struct dw_dma *to_dw_dma(struct dma_device *ddev) /* LLI == Linked List Item; a.k.a. DMA block descriptor */ struct dw_lli { /* values that are not changed by hardware */ - dma_addr_t sar; - dma_addr_t dar; - dma_addr_t llp; /* chain to next lli */ + u32 sar; + u32 dar; + u32 llp; /* chain to next lli */ u32 ctllo; /* values that may get written back: */ u32 ctlhi; |