The patch number 10914 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
v4l2: fix compile warnings when printing u64 value.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/video/adv7170.c | 7 ++++---
linux/drivers/media/video/adv7175.c | 5 +++--
linux/drivers/media/video/bt819.c | 5 +++--
linux/drivers/media/video/bt856.c | 2 +-
linux/drivers/media/video/bt866.c | 2 +-
linux/drivers/media/video/ks0127.c | 4 ++--
linux/drivers/media/video/saa7110.c | 2 +-
linux/drivers/media/video/vpx3220.c | 2 +-
8 files changed, 16 insertions(+), 13 deletions(-)
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/adv7170.c
--- a/linux/drivers/media/video/adv7170.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/adv7170.c Fri Mar 06 14:15:01 2009 +0100
@@ -205,7 +205,7 @@ static int adv7170_s_std_output(struct v
{
struct adv7170 *encoder = to_adv7170(sd);
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
adv7170_write_block(sd, init_NTSC, sizeof(init_NTSC));
@@ -220,10 +220,11 @@ static int adv7170_s_std_output(struct v
adv7170_write(sd, 0x07, TR0MODE | TR0RST);
adv7170_write(sd, 0x07, TR0MODE);
} else {
- v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std);
+ v4l2_dbg(1, debug, sd, "illegal norm: %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
- v4l2_dbg(1, debug, sd, "switched to %llx\n", std);
+ v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std);
encoder->norm = std;
return 0;
}
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/adv7175.c
--- a/linux/drivers/media/video/adv7175.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/adv7175.c Fri Mar 06 14:15:01 2009 +0100
@@ -238,10 +238,11 @@ static int adv7175_s_std_output(struct v
adv7175_write(sd, 0x07, TR0MODE | TR0RST);
adv7175_write(sd, 0x07, TR0MODE);
} else {
- v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std);
+ v4l2_dbg(1, debug, sd, "illegal norm: %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
- v4l2_dbg(1, debug, sd, "switched to %llx\n", std);
+ v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std);
encoder->norm = std;
return 0;
}
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/bt819.c
--- a/linux/drivers/media/video/bt819.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/bt819.c Fri Mar 06 14:15:01 2009 +0100
@@ -254,7 +254,7 @@ static int bt819_s_std(struct v4l2_subde
struct bt819 *decoder = to_bt819(sd);
struct timing *timing = NULL;
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
bt819_setbit(decoder, 0x01, 0, 1);
@@ -273,7 +273,8 @@ static int bt819_s_std(struct v4l2_subde
/* bt819_setbit(decoder, 0x1a, 5, 0); */
timing = &timing_data[0];
} else {
- v4l2_dbg(1, debug, sd, "unsupported norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "unsupported norm %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
bt819_write(decoder, 0x03,
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/bt856.c
--- a/linux/drivers/media/video/bt856.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/bt856.c Fri Mar 06 14:15:01 2009 +0100
@@ -131,7 +131,7 @@ static int bt856_s_std_output(struct v4l
{
struct bt856 *encoder = to_bt856(sd);
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
bt856_setbit(encoder, 0xdc, 2, 0);
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/bt866.c
--- a/linux/drivers/media/video/bt866.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/bt866.c Fri Mar 06 14:15:01 2009 +0100
@@ -97,7 +97,7 @@ static int bt866_write(struct bt866 *enc
static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
{
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
/* Only PAL supported by this driver at the moment! */
if (!(std & V4L2_STD_NTSC))
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/ks0127.c
--- a/linux/drivers/media/video/ks0127.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/ks0127.c Fri Mar 06 14:15:01 2009 +0100
@@ -589,8 +589,8 @@ static int ks0127_s_std(struct v4l2_subd
/* force to secam mode */
ks0127_and_or(sd, KS_DEMOD, 0xf0, 0x0f);
} else {
- v4l2_dbg(1, debug, sd,
- "VIDIOC_S_STD: Unknown norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "VIDIOC_S_STD: Unknown norm %llx\n",
+ (unsigned long long)std);
}
return 0;
}
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/saa7110.c
--- a/linux/drivers/media/video/saa7110.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/saa7110.c Fri Mar 06 14:15:01 2009 +0100
@@ -257,7 +257,7 @@ static int saa7110_g_input_status(struct
int status = saa7110_read(sd);
v4l2_dbg(1, debug, sd, "status=0x%02x norm=%llx\n",
- status, decoder->norm);
+ status, (unsigned long long)decoder->norm);
if (!(status & 0x40))
res = 0;
if (!(status & 0x03))
diff -r 2a66a937f7ed -r 6f5ca0bdb329 linux/drivers/media/video/vpx3220.c
--- a/linux/drivers/media/video/vpx3220.c Fri Mar 06 14:05:50 2009 +0100
+++ b/linux/drivers/media/video/vpx3220.c Fri Mar 06 14:15:01 2009 +0100
@@ -374,7 +374,7 @@ static int vpx3220_s_std(struct v4l2_sub
choosen video norm */
temp_input = vpx3220_fp_read(sd, 0xf2);
- v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", std);
+ v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1);
v4l2_dbg(1, debug, sd, "norm switched to NTSC\n");
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6f5ca0bdb329737cfc58304b7dd3c66ec1e25cbc
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
