fsldma: Fix fsldma.c warning messages when it's compiled under PPC64.

There are warning messages reported by Stephen Rothwell with
ARCH=powerpc allmodconfig build:

drivers/dma/fsldma.c: In function 'fsl_dma_prep_memcpy':
drivers/dma/fsldma.c:439: warning: comparison of distinct pointer types
lacks a cast
drivers/dma/fsldma.c: In function 'fsl_chan_xfer_ld_queue':
drivers/dma/fsldma.c:584: warning: format '%016llx' expects type 'long long
unsigned int', but argument 4 has type 'dma_addr_t'
drivers/dma/fsldma.c: In function 'fsl_dma_chan_do_interrupt':
drivers/dma/fsldma.c:668: warning: format '%x' expects type 'unsigned int',
but argument 5 has type 'dma_addr_t'
drivers/dma/fsldma.c:684: warning: format '%016llx' expects type 'long long
unsigned int', but argument 4 has type 'dma_addr_t'
drivers/dma/fsldma.c:684: warning: format '%016llx' expects type 'long long
unsigned int', but argument 5 has type 'dma_addr_t'
drivers/dma/fsldma.c:701: warning: format '%02x' expects type 'unsigned
int', but argument 4 has type 'dma_addr_t'
drivers/dma/fsldma.c: In function 'fsl_dma_self_test':
drivers/dma/fsldma.c:840: warning: format '%d' expects type 'int', but
argument 5 has type 'size_t'
drivers/dma/fsldma.c: In function 'of_fsl_dma_probe':
drivers/dma/fsldma.c:1010: warning: format '%08x' expects type 'unsigned
int', but argument 5 has type 'resource_size_t'

This patch fixed the above warning messages.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

authored by Zhang Wei and committed by Dan Williams 56822843 93d74463

+16 -13
+16 -13
drivers/dma/fsldma.c
··· 57 57 58 58 } 59 59 60 - static void set_sr(struct fsl_dma_chan *fsl_chan, dma_addr_t val) 60 + static void set_sr(struct fsl_dma_chan *fsl_chan, u32 val) 61 61 { 62 62 DMA_OUT(fsl_chan, &fsl_chan->reg_base->sr, val, 32); 63 63 } 64 64 65 - static dma_addr_t get_sr(struct fsl_dma_chan *fsl_chan) 65 + static u32 get_sr(struct fsl_dma_chan *fsl_chan) 66 66 { 67 67 return DMA_IN(fsl_chan, &fsl_chan->reg_base->sr, 32); 68 68 } ··· 436 436 dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new); 437 437 #endif 438 438 439 - copy = min(len, FSL_DMA_BCR_MAX_CNT); 439 + copy = min(len, (size_t)FSL_DMA_BCR_MAX_CNT); 440 440 441 441 set_desc_cnt(fsl_chan, &new->hw, copy); 442 442 set_desc_src(fsl_chan, &new->hw, dma_src); ··· 581 581 if (ld_node != &fsl_chan->ld_queue) { 582 582 /* Get the ld start address from ld_queue */ 583 583 next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys; 584 - dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%016llx\n", 585 - (u64)next_dest_addr); 584 + dev_dbg(fsl_chan->dev, "xfer LDs staring from %p\n", 585 + (void *)next_dest_addr); 586 586 set_cdar(fsl_chan, next_dest_addr); 587 587 dma_start(fsl_chan); 588 588 } else { ··· 662 662 static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data) 663 663 { 664 664 struct fsl_dma_chan *fsl_chan = (struct fsl_dma_chan *)data; 665 - dma_addr_t stat; 665 + u32 stat; 666 666 667 667 stat = get_sr(fsl_chan); 668 668 dev_dbg(fsl_chan->dev, "event: channel %d, stat = 0x%x\n", ··· 681 681 */ 682 682 if (stat & FSL_DMA_SR_EOSI) { 683 683 dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n"); 684 - dev_dbg(fsl_chan->dev, "event: clndar 0x%016llx, " 685 - "nlndar 0x%016llx\n", (u64)get_cdar(fsl_chan), 686 - (u64)get_ndar(fsl_chan)); 684 + dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n", 685 + (void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan)); 687 686 stat &= ~FSL_DMA_SR_EOSI; 688 687 } 689 688 ··· 725 726 fsl_chan_ld_cleanup(fsl_chan); 726 727 } 727 728 729 + #ifdef FSL_DMA_CALLBACKTEST 728 730 static void fsl_dma_callback_test(struct fsl_dma_chan *fsl_chan) 729 731 { 730 732 if (fsl_chan) 731 733 dev_info(fsl_chan->dev, "selftest: callback is ok!\n"); 732 734 } 735 + #endif 733 736 737 + #ifdef CONFIG_FSL_DMA_SELFTEST 734 738 static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan) 735 739 { 736 740 struct dma_chan *chan; ··· 839 837 if (err) { 840 838 for (i = 0; (*(src + i) == *(dest + i)) && (i < test_size); 841 839 i++); 842 - dev_err(fsl_chan->dev, "selftest: Test failed, data %d/%d is " 840 + dev_err(fsl_chan->dev, "selftest: Test failed, data %d/%ld is " 843 841 "error! src 0x%x, dest 0x%x\n", 844 - i, test_size, *(src + i), *(dest + i)); 842 + i, (long)test_size, *(src + i), *(dest + i)); 845 843 } 846 844 847 845 free_resources: ··· 850 848 kfree(src); 851 849 return err; 852 850 } 851 + #endif 853 852 854 853 static int __devinit of_fsl_dma_chan_probe(struct of_device *dev, 855 854 const struct of_device_id *match) ··· 1011 1008 } 1012 1009 1013 1010 dev_info(&dev->dev, "Probe the Freescale DMA driver for %s " 1014 - "controller at 0x%08x...\n", 1015 - match->compatible, fdev->reg.start); 1011 + "controller at %p...\n", 1012 + match->compatible, (void *)fdev->reg.start); 1016 1013 fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end 1017 1014 - fdev->reg.start + 1); 1018 1015