On Fri, Jul 13, 2012 at 9:09 AM, Andy Shevchenko
<andriy.shevche...@linux.intel.com> wrote:
> 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.shevche...@linux.intel.com>
> ---
> drivers/dma/dw_dmac.c | 7 ++-----
> 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 db56ef4..3d061c6 100644
> --- a/drivers/dma/dw_dmac.c
> +++ b/drivers/dma/dw_dmac.c
> @@ -416,11 +416,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 e248481..50830be 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;
Acked-by: Viresh Kumar <viresh.ku...@linaro.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
