Commit ce01cbdc authored Nov 01, 2013 by Mauro Carvalho Chehab

[media] uvc/lirc_serial: Fix some warnings on parisc arch

On this arch, usec is not unsigned long. So, we need to typecast,
in order to remove those warnings:
drivers/media/usb/uvc/uvc_video.c: In function 'uvc_video_clock_update':
drivers/media/usb/uvc/uvc_video.c:678:2: warning: format '%lu' expects argument of type 'long unsigned int', but argument 9 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c: In function 'irq_handler':
drivers/staging/media/lirc/lirc_serial.c:707:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c:707:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 7 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c:719:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c:719:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 7 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c:728:6: warning: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type '__kernel_suseconds_t' [-Wformat]
drivers/staging/media/lirc/lirc_serial.c:728:6: warning: format '%lx' expects argument of type 'long unsigned int', but argument 7 has type '__kernel_suseconds_t' [-Wformat]

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

parent 221cefa4

drivers/media/usb/uvc/uvc_video.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -680,7 +680,8 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
		stream->dev->name,
		sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
		y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC,
		v4l2_buf->timestamp.tv_sec, v4l2_buf->timestamp.tv_usec,
		v4l2_buf->timestamp.tv_sec,
		(unsigned long)v4l2_buf->timestamp.tv_usec,
		x1, first->host_sof, first->dev_sof,
		x2, last->host_sof, last->dev_sof, y1, y2);

drivers/staging/media/lirc/lirc_serial.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -707,7 +707,8 @@ static irqreturn_t irq_handler(int i, void *blah)
		pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n",
		dcd, sense,
		tv.tv_sec, lasttv.tv_sec,
		tv.tv_usec, lasttv.tv_usec);
		(unsigned long)tv.tv_usec,
		(unsigned long)lasttv.tv_usec);
		continue;
		}

		@@ -719,7 +720,8 @@ static irqreturn_t irq_handler(int i, void *blah)
		pr_warn("%d %d %lx %lx %lx %lx\n",
		dcd, sense,
		tv.tv_sec, lasttv.tv_sec,
		tv.tv_usec, lasttv.tv_usec);
		(unsigned long)tv.tv_usec,
		(unsigned long)lasttv.tv_usec);
		data = PULSE_MASK;
		} else if (deltv > 15) {
		data = PULSE_MASK; /* really long time */
		@@ -728,7 +730,8 @@ static irqreturn_t irq_handler(int i, void *blah)
		pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n",
		dcd, sense,
		tv.tv_sec, lasttv.tv_sec,
		tv.tv_usec, lasttv.tv_usec);
		(unsigned long)tv.tv_usec,
		(unsigned long)lasttv.tv_usec);
		/*
		* detecting pulse while this
		* MUST be a space!