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

Commit 2abd1f43 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[media] mx3_camera: use %pad format string for dma_ddr_t 



The mx3_camera driver prints DMA addresses using the "%x" format
string, which is wrong when using a 64-bit dma_addr_t definition:

media/platform/soc_camera/mx3_camera.c: In function 'mx3_cam_dma_done':
media/platform/soc_camera/mx3_camera.c:149:125: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=]
media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_queue':
media/platform/soc_camera/mx3_camera.c:317:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=]
media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_release':
media/platform/soc_camera/mx3_camera.c:346:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=]

This changes the code to use the special %pad format string, which
always does the right thing.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c54ae8fe

drivers/media/platform/soc_camera/mx3_camera.c

+6 −6
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ static void mx3_cam_dma_done(void *arg) 
	struct idmac_channel *ichannel = to_idmac_chan(chan);

	struct mx3_camera_dev *mx3_cam = ichannel->client;



	dev_dbg(chan->device->dev, "callback cookie %d, active DMA 0x%08x\n",

		desc->txd.cookie, mx3_cam->active ? sg_dma_address(&mx3_cam->active->sg) : 0);

	dev_dbg(chan->device->dev, "callback cookie %d, active DMA %pad\n",

		desc->txd.cookie, mx3_cam->active ? &sg_dma_address(&mx3_cam->active->sg) : NULL);



	spin_lock(&mx3_cam->lock);

	if (mx3_cam->active) {
@@ -314,8 +314,8 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) 
	spin_unlock_irq(&mx3_cam->lock);



	cookie = txd->tx_submit(txd);

	dev_dbg(icd->parent, "Submitted cookie %d DMA 0x%08x\n",

		cookie, sg_dma_address(&buf->sg));

	dev_dbg(icd->parent, "Submitted cookie %d DMA %pad\n",

		cookie, &sg_dma_address(&buf->sg));



	if (cookie >= 0)

		return;
@@ -344,8 +344,8 @@ static void mx3_videobuf_release(struct vb2_buffer *vb) 
	unsigned long flags;



	dev_dbg(icd->parent,

		"Release%s DMA 0x%08x, queue %sempty\n",

		mx3_cam->active == buf ? " active" : "", sg_dma_address(&buf->sg),

		"Release%s DMA %pad, queue %sempty\n",

		mx3_cam->active == buf ? " active" : "", &sg_dma_address(&buf->sg),

		list_empty(&buf->queue) ? "" : "not ");



	spin_lock_irqsave(&mx3_cam->lock, flags);