Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b787f2e2 authored by Kumar Gala's avatar Kumar Gala Committed by Dan Williams
Browse files

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: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 2e077f8e

drivers/dma/fsldma.c

+7 −6
Original line number Diff line number Diff line
@@ -641,8 +641,8 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan) 
	if (ld_node != &fsl_chan->ld_queue) {

		/* Get the ld start address from ld_queue */

		next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;

		dev_dbg(fsl_chan->dev, "xfer LDs staring from %p\n",

				(void *)next_dest_addr);

		dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",

				(unsigned long long)next_dest_addr);

		set_cdar(fsl_chan, next_dest_addr);

		dma_start(fsl_chan);

	} else {
@@ -756,8 +756,9 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data) 
	 */

	if (stat & FSL_DMA_SR_EOSI) {

		dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n");

		dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n",

			(void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan));

		dev_dbg(fsl_chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",

			(unsigned long long)get_cdar(fsl_chan),

			(unsigned long long)get_ndar(fsl_chan));

		stat &= ~FSL_DMA_SR_EOSI;

		update_cookie = 1;

	}
@@ -947,8 +948,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev, 
	}



	dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "

			"controller at %p...\n",

			match->compatible, (void *)fdev->reg.start);

			"controller at 0x%llx...\n",

			match->compatible, (unsigned long long)fdev->reg.start);

	fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end

						- fdev->reg.start + 1);