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

Commit 42e4a12a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Vinod Koul
Browse files

DMA: shdma: Fix warnings due to improper casts and printk formats 



Use the %zu and %pad printk specifiers to print size_t and dma_addr_t
variables, and cast pointers to uintptr_t instead of unsigned int where
applicable. This fixes warnings on platforms where pointers and/or
dma_addr_t have a different size than int

Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent d6be34fb

drivers/dma/sh/shdma-base.c

+5 −5
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ bool shdma_chan_filter(struct dma_chan *chan, void *arg) 
	struct shdma_chan *schan = to_shdma_chan(chan);

	struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device);

	const struct shdma_ops *ops = sdev->ops;

	int match = (int)arg;

	int match = (long)arg;

	int ret;



	if (match < 0)
@@ -491,8 +491,8 @@ static struct shdma_desc *shdma_add_desc(struct shdma_chan *schan, 
	}



	dev_dbg(schan->dev,

		"chaining (%u/%u)@%x -> %x with %p, cookie %d\n",

		copy_size, *len, *src, *dst, &new->async_tx,

		"chaining (%zu/%zu)@%pad -> %pad with %p, cookie %d\n",

		copy_size, *len, src, dst, &new->async_tx,

		new->async_tx.cookie);



	new->mark = DESC_PREPARED;
@@ -555,8 +555,8 @@ static struct dma_async_tx_descriptor *shdma_prep_sg(struct shdma_chan *schan, 
			goto err_get_desc;



		do {

			dev_dbg(schan->dev, "Add SG #%d@%p[%d], dma %llx\n",

				i, sg, len, (unsigned long long)sg_addr);

			dev_dbg(schan->dev, "Add SG #%d@%p[%zu], dma %pad\n",

				i, sg, len, &sg_addr);



			if (direction == DMA_DEV_TO_MEM)

				new = shdma_add_desc(schan, flags,

drivers/dma/sh/shdma-of.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static struct dma_chan *shdma_of_xlate(struct of_phandle_args *dma_spec, 
	/* Only slave DMA channels can be allocated via DT */

	dma_cap_set(DMA_SLAVE, mask);



	chan = dma_request_channel(mask, shdma_chan_filter, (void *)id);

	chan = dma_request_channel(mask, shdma_chan_filter,

				   (void *)(uintptr_t)id);

	if (chan)

		to_shdma_chan(chan)->hw_req = id;

drivers/dma/sh/sudmac.c

+2 −2
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ static int sudmac_desc_setup(struct shdma_chan *schan, 
	struct sudmac_chan *sc = to_chan(schan);

	struct sudmac_desc *sd = to_desc(sdesc);



	dev_dbg(sc->shdma_chan.dev, "%s: src=%x, dst=%x, len=%d\n",

		__func__, src, dst, *len);

	dev_dbg(sc->shdma_chan.dev, "%s: src=%pad, dst=%pad, len=%zu\n",

		__func__, &src, &dst, *len);



	if (*len > schan->max_xfer_len)

		*len = schan->max_xfer_len;