From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Viresh Kumar <viresh.linux@gmail.com>,
linux-kernel@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
Dan Williams <dan.j.williams@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH 2/3] dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
Date: Fri, 13 Jul 2012 11:09:33 +0300 [thread overview]
Message-ID: <1342166974-4490-2-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1342166974-4490-1-git-send-email-andriy.shevchenko@linux.intel.com>
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>
---
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;
--
1.7.10.4
next prev parent reply other threads:[~2012-07-13 8:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 8:09 [PATCH 1/3] dw_dmac: mark dwc_dump_lli inline Andy Shevchenko
2012-07-13 8:09 ` Andy Shevchenko [this message]
2012-07-13 8:27 ` [PATCH 2/3] dw_dmac: use 'u32' for LLI structure members, not dma_addr_t viresh kumar
2012-07-13 8:09 ` [PATCH 3/3] dw_dmac: set default alignment Andy Shevchenko
2012-07-13 8:26 ` viresh kumar
2012-07-13 8:45 ` Andy Shevchenko
2012-07-13 8:56 ` viresh kumar
2012-07-13 10:04 ` Andy Shevchenko
2012-07-13 10:30 ` viresh kumar
2012-07-13 10:34 ` Andy Shevchenko
2012-07-13 8:27 ` [PATCH 1/3] dw_dmac: mark dwc_dump_lli inline viresh kumar
2012-07-16 6:34 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342166974-4490-2-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox