Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8609c2b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 93aad1bc

drivers/dma/dw_dmac.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

drivers/dma/dw_dmac_regs.h

+3 −3
Original line number Diff line number Diff line
@@ -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;