[ARM] pxa: simplify DMA register definitions

1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and
   pass DRCMR index by "struct resource" if possible

2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use
   DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 388cf94055d3..cf96b2cc4f1c 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -1025,9 +1025,9 @@ static int pxa_camera_resume(struct soc_camera_device *icd)
         struct pxa_camera_dev *pcdev = ici->priv;
         int i = 0, ret = 0;
 
-        DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD;
-        DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD;
-        DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD;
+        DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD;
+        DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD;
+        DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD;
 
         CICR0 = pcdev->save_cicr[i++] & ~CICR0_ENB;
         CICR1 = pcdev->save_cicr[i++];
@@ -1171,9 +1171,9 @@ static int pxa_camera_probe(struct platform_device *pdev)
         }
         dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]);
 
-        DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD;
-        DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD;
-        DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD;
+        DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD;
+        DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD;
+        DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD;
 
         /* request irq */
         err = request_irq(pcdev->irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME,
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 4aa61a1a3d55..c5b02b66f756 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -572,8 +572,8 @@ static void pxa_irda_startup(struct pxa_irda *si)
         ICCR2 = ICCR2_TXP | ICCR2_TRIG_32;
 
         /* configure DMAC */
-        DRCMR17 = si->rxdma | DRCMR_MAPVLD;
-        DRCMR18 = si->txdma | DRCMR_MAPVLD;
+        DRCMR(17) = si->rxdma | DRCMR_MAPVLD;
+        DRCMR(18) = si->txdma | DRCMR_MAPVLD;
 
         /* force SIR reinitialization */
         si->speed = 4000000;
@@ -602,8 +602,8 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         /* disable the STUART or FICP clocks */
         pxa_irda_disable_clk(si);
 
-        DRCMR17 = 0;
-        DRCMR18 = 0;
+        DRCMR(17) = 0;
+        DRCMR(18) = 0;
 
         local_irq_restore(flags);