linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] dma: mmp_pdma: factor out DRCMR register calculation
Date: Wed,  7 Aug 2013 12:19:21 +0200	[thread overview]
Message-ID: <1375870770-14263-4-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1375870770-14263-1-git-send-email-zonque@gmail.com>

The exact same calculation is done twice, so let's factor it out to a
macro.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 drivers/dma/mmp_pdma.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 2844eaf..8d6aae3 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -47,6 +47,8 @@
 #define DCSR_CMPST	(1 << 10)       /* The Descriptor Compare Status */
 #define DCSR_EORINTR	(1 << 9)        /* The end of Receive */
 
+#define DRCMR(n)	((((n) < 64) ? 0x0100 : 0x1100) + \
+				 (((n) & 0x3f) << 2))
 #define DRCMR_MAPVLD	(1 << 7)	/* Map Valid (read / write) */
 #define DRCMR_CHLNUM	0x1f		/* mask for Channel Number (read / write) */
 
@@ -143,8 +145,7 @@ static void enable_chan(struct mmp_pdma_phy *phy)
 	if (!phy->vchan)
 		return;
 
-	reg = phy->vchan->drcmr;
-	reg = (((reg) < 64) ? 0x0100 : 0x1100) + (((reg) & 0x3f) << 2);
+	reg = DRCMR(phy->vchan->drcmr);
 	writel(DRCMR_MAPVLD | phy->idx, phy->base + reg);
 
 	reg = (phy->idx << 2) + DCSR;
@@ -258,8 +259,7 @@ static void mmp_pdma_free_phy(struct mmp_pdma_chan *pchan)
 		return;
 
 	/* clear the channel mapping in DRCMR */
-	reg = pchan->phy->vchan->drcmr;
-	reg = ((reg < 64) ? 0x0100 : 0x1100) + ((reg & 0x3f) << 2);
+	reg = DRCMR(pchan->phy->vchan->drcmr);
 	writel(0, pchan->phy->base + reg);
 
 	spin_lock_irqsave(&pdev->phy_lock, flags);
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-07 10:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-07 10:19 [PATCH 00/12] dma: pdma: some patches needed for PXA DT environments Daniel Mack
2013-08-07 10:19 ` [PATCH 01/12] dma: mmp_pdma: add protect when alloc/free phy channels Daniel Mack
2013-08-07 12:40   ` Ezequiel Garcia
2013-08-07 12:42     ` Daniel Mack
2013-08-08  8:35     ` Daniel Mack
2013-08-07 10:19 ` [PATCH 02/12] dma: mmp_pdma: clear DRCMR when free a phy channel Daniel Mack
2013-08-07 10:19 ` Daniel Mack [this message]
2013-08-07 10:19 ` [PATCH 04/12] dma: mmp_pdma: fix maximum transfer length Daniel Mack
2013-08-07 10:19 ` [PATCH 05/12] dma: mmp_pdma: add filter function Daniel Mack
2013-08-07 10:19 ` [PATCH 06/12] dma: mmp_pdma: make the controller a DMA provider Daniel Mack
2013-08-07 16:12   ` Arnd Bergmann
2013-08-07 16:17     ` Daniel Mack
2013-08-07 20:17       ` Arnd Bergmann
2013-08-08  8:38     ` Daniel Mack
2013-08-09 13:10     ` Daniel Mack
2013-08-09 14:32       ` zhangfei gao
2013-08-09 21:08         ` Arnd Bergmann
2013-08-07 10:19 ` [PATCH 07/12] dma: mmp_pdma: print the number of channels at probe time Daniel Mack
2013-08-07 10:19 ` [PATCH 08/12] dma: mmp_pdma: remove duplicate assignment Daniel Mack
2013-08-07 10:19 ` [PATCH 09/12] dma: mmp_pdma: add support for byte-aligned transfers Daniel Mack
2013-08-08  9:04   ` Xiang Wang
2013-08-08  9:11     ` Daniel Mack
2013-08-16  8:05       ` Xiang Wang
2013-08-07 10:19 ` [PATCH 10/12] dma: mmp_pdma: implement DMA_PAUSE and DMA_RESUME Daniel Mack
2013-08-07 10:19 ` [PATCH 11/12] dma: mmp_pdma: add support for residue reporting Daniel Mack
2013-08-07 10:19 ` [PATCH 12/12] dma: mmp_pdma: add support for cyclic DMA descriptors Daniel Mack

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=1375870770-14263-4-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).