aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2009-05-13 17:23:57 -0400
committerKumar Gala <galak@kernel.crashing.org>2009-05-19 01:50:36 -0400
commit190ee6ed71577257106a0366c16473a5c81f582f (patch)
treee04bd3052170729c292b8706399b6841806e076a
parentbd78c33a096a73f09b1b998a481290e229382a8b (diff)
fsldma: Fix compile warnings
We we build with dma_addr_t as a 64-bit quantity we get: drivers/dma/fsldma.c: In function 'fsl_chan_xfer_ld_queue': drivers/dma/fsldma.c:625: warning: cast to pointer from integer of different size drivers/dma/fsldma.c: In function 'fsl_dma_chan_do_interrupt': drivers/dma/fsldma.c:737: warning: cast to pointer from integer of different size drivers/dma/fsldma.c:737: warning: cast to pointer from integer of different size drivers/dma/fsldma.c: In function 'of_fsl_dma_probe': drivers/dma/fsldma.c:927: warning: cast to pointer from integer of different Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/fsldma.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index da8a8ed9e411..66a7687cca73 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -622,8 +622,8 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
622 if (ld_node != &fsl_chan->ld_queue) { 622 if (ld_node != &fsl_chan->ld_queue) {
623 /* Get the ld start address from ld_queue */ 623 /* Get the ld start address from ld_queue */
624 next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys; 624 next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
625 dev_dbg(fsl_chan->dev, "xfer LDs staring from %p\n", 625 dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",
626 (void *)next_dest_addr); 626 (unsigned long long)next_dest_addr);
627 set_cdar(fsl_chan, next_dest_addr); 627 set_cdar(fsl_chan, next_dest_addr);
628 dma_start(fsl_chan); 628 dma_start(fsl_chan);
629 } else { 629 } else {
@@ -734,8 +734,9 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
734 */ 734 */
735 if (stat & FSL_DMA_SR_EOSI) { 735 if (stat & FSL_DMA_SR_EOSI) {
736 dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n"); 736 dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n");
737 dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n", 737 dev_dbg(fsl_chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",
738 (void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan)); 738 (unsigned long long)get_cdar(fsl_chan),
739 (unsigned long long)get_ndar(fsl_chan));
739 stat &= ~FSL_DMA_SR_EOSI; 740 stat &= ~FSL_DMA_SR_EOSI;
740 update_cookie = 1; 741 update_cookie = 1;
741 } 742 }
@@ -925,8 +926,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
925 } 926 }
926 927
927 dev_info(&dev->dev, "Probe the Freescale DMA driver for %s " 928 dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "
928 "controller at %p...\n", 929 "controller at 0x%llx...\n",
929 match->compatible, (void *)fdev->reg.start); 930 match->compatible, (unsigned long long)fdev->reg.start);
930 fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end 931 fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end
931 - fdev->reg.start + 1); 932 - fdev->reg.start + 1);
932 933