diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-06 08:15:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:15 -0400 |
commit | cc5cef8ea4fdc41b44007c5d2c116fe97cb87293 (patch) | |
tree | 76743535f52f266ae0c3e1711503ace8ef2d3861 | |
parent | 9185cbfc336a080695304bcb781186559d987974 (diff) |
V4L/DVB (10914): v4l2: fix compile warnings when printing u64 value.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/adv7170.c | 7 | ||||
-rw-r--r-- | drivers/media/video/adv7175.c | 5 | ||||
-rw-r--r-- | drivers/media/video/bt819.c | 5 | ||||
-rw-r--r-- | drivers/media/video/bt856.c | 2 | ||||
-rw-r--r-- | drivers/media/video/bt866.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ks0127.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7110.c | 2 | ||||
-rw-r--r-- | drivers/media/video/vpx3220.c | 2 |
8 files changed, 16 insertions, 13 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index 43fd1d24cdeb..873c30a41bd7 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
@@ -195,7 +195,7 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
195 | { | 195 | { |
196 | struct adv7170 *encoder = to_adv7170(sd); | 196 | struct adv7170 *encoder = to_adv7170(sd); |
197 | 197 | ||
198 | v4l2_dbg(1, debug, sd, "set norm %llx\n", std); | 198 | v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std); |
199 | 199 | ||
200 | if (std & V4L2_STD_NTSC) { | 200 | if (std & V4L2_STD_NTSC) { |
201 | adv7170_write_block(sd, init_NTSC, sizeof(init_NTSC)); | 201 | adv7170_write_block(sd, init_NTSC, sizeof(init_NTSC)); |
@@ -210,10 +210,11 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
210 | adv7170_write(sd, 0x07, TR0MODE | TR0RST); | 210 | adv7170_write(sd, 0x07, TR0MODE | TR0RST); |
211 | adv7170_write(sd, 0x07, TR0MODE); | 211 | adv7170_write(sd, 0x07, TR0MODE); |
212 | } else { | 212 | } else { |
213 | v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std); | 213 | v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", |
214 | (unsigned long long)std); | ||
214 | return -EINVAL; | 215 | return -EINVAL; |
215 | } | 216 | } |
216 | v4l2_dbg(1, debug, sd, "switched to %llx\n", std); | 217 | v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std); |
217 | encoder->norm = std; | 218 | encoder->norm = std; |
218 | return 0; | 219 | return 0; |
219 | } | 220 | } |
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index 709e044f007d..ff1210303295 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
@@ -228,10 +228,11 @@ static int adv7175_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
228 | adv7175_write(sd, 0x07, TR0MODE | TR0RST); | 228 | adv7175_write(sd, 0x07, TR0MODE | TR0RST); |
229 | adv7175_write(sd, 0x07, TR0MODE); | 229 | adv7175_write(sd, 0x07, TR0MODE); |
230 | } else { | 230 | } else { |
231 | v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std); | 231 | v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", |
232 | (unsigned long long)std); | ||
232 | return -EINVAL; | 233 | return -EINVAL; |
233 | } | 234 | } |
234 | v4l2_dbg(1, debug, sd, "switched to %llx\n", std); | 235 | v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std); |
235 | encoder->norm = std; | 236 | encoder->norm = std; |
236 | return 0; | 237 | return 0; |
237 | } | 238 | } |
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c index f2ebf8441aa0..e0d8e2b186d1 100644 --- a/drivers/media/video/bt819.c +++ b/drivers/media/video/bt819.c | |||
@@ -248,7 +248,7 @@ static int bt819_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
248 | struct bt819 *decoder = to_bt819(sd); | 248 | struct bt819 *decoder = to_bt819(sd); |
249 | struct timing *timing = NULL; | 249 | struct timing *timing = NULL; |
250 | 250 | ||
251 | v4l2_dbg(1, debug, sd, "set norm %llx\n", std); | 251 | v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std); |
252 | 252 | ||
253 | if (std & V4L2_STD_NTSC) { | 253 | if (std & V4L2_STD_NTSC) { |
254 | bt819_setbit(decoder, 0x01, 0, 1); | 254 | bt819_setbit(decoder, 0x01, 0, 1); |
@@ -267,7 +267,8 @@ static int bt819_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
267 | /* bt819_setbit(decoder, 0x1a, 5, 0); */ | 267 | /* bt819_setbit(decoder, 0x1a, 5, 0); */ |
268 | timing = &timing_data[0]; | 268 | timing = &timing_data[0]; |
269 | } else { | 269 | } else { |
270 | v4l2_dbg(1, debug, sd, "unsupported norm %llx\n", std); | 270 | v4l2_dbg(1, debug, sd, "unsupported norm %llx\n", |
271 | (unsigned long long)std); | ||
271 | return -EINVAL; | 272 | return -EINVAL; |
272 | } | 273 | } |
273 | bt819_write(decoder, 0x03, | 274 | bt819_write(decoder, 0x03, |
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index af3c7a885d50..78db39503947 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c | |||
@@ -125,7 +125,7 @@ static int bt856_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
125 | { | 125 | { |
126 | struct bt856 *encoder = to_bt856(sd); | 126 | struct bt856 *encoder = to_bt856(sd); |
127 | 127 | ||
128 | v4l2_dbg(1, debug, sd, "set norm %llx\n", std); | 128 | v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std); |
129 | 129 | ||
130 | if (std & V4L2_STD_NTSC) { | 130 | if (std & V4L2_STD_NTSC) { |
131 | bt856_setbit(encoder, 0xdc, 2, 0); | 131 | bt856_setbit(encoder, 0xdc, 2, 0); |
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c index 0a32221fa3f9..350cae4b02c3 100644 --- a/drivers/media/video/bt866.c +++ b/drivers/media/video/bt866.c | |||
@@ -91,7 +91,7 @@ static int bt866_write(struct bt866 *encoder, u8 subaddr, u8 data) | |||
91 | 91 | ||
92 | static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | 92 | static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) |
93 | { | 93 | { |
94 | v4l2_dbg(1, debug, sd, "set norm %llx\n", std); | 94 | v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std); |
95 | 95 | ||
96 | /* Only PAL supported by this driver at the moment! */ | 96 | /* Only PAL supported by this driver at the moment! */ |
97 | if (!(std & V4L2_STD_NTSC)) | 97 | if (!(std & V4L2_STD_NTSC)) |
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c index 678c4e23f0e8..4b3a116f2f59 100644 --- a/drivers/media/video/ks0127.c +++ b/drivers/media/video/ks0127.c | |||
@@ -579,8 +579,8 @@ static int ks0127_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
579 | /* force to secam mode */ | 579 | /* force to secam mode */ |
580 | ks0127_and_or(sd, KS_DEMOD, 0xf0, 0x0f); | 580 | ks0127_and_or(sd, KS_DEMOD, 0xf0, 0x0f); |
581 | } else { | 581 | } else { |
582 | v4l2_dbg(1, debug, sd, | 582 | v4l2_dbg(1, debug, sd, "VIDIOC_S_STD: Unknown norm %llx\n", |
583 | "VIDIOC_S_STD: Unknown norm %llx\n", std); | 583 | (unsigned long long)std); |
584 | } | 584 | } |
585 | return 0; | 585 | return 0; |
586 | } | 586 | } |
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 977de63fded0..df4e08d2dceb 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c | |||
@@ -251,7 +251,7 @@ static int saa7110_g_input_status(struct v4l2_subdev *sd, u32 *pstatus) | |||
251 | int status = saa7110_read(sd); | 251 | int status = saa7110_read(sd); |
252 | 252 | ||
253 | v4l2_dbg(1, debug, sd, "status=0x%02x norm=%llx\n", | 253 | v4l2_dbg(1, debug, sd, "status=0x%02x norm=%llx\n", |
254 | status, decoder->norm); | 254 | status, (unsigned long long)decoder->norm); |
255 | if (!(status & 0x40)) | 255 | if (!(status & 0x40)) |
256 | res = 0; | 256 | res = 0; |
257 | if (!(status & 0x03)) | 257 | if (!(status & 0x03)) |
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index ed50b912d8a0..0cc23539f74d 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
@@ -354,7 +354,7 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
354 | choosen video norm */ | 354 | choosen video norm */ |
355 | temp_input = vpx3220_fp_read(sd, 0xf2); | 355 | temp_input = vpx3220_fp_read(sd, 0xf2); |
356 | 356 | ||
357 | v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", std); | 357 | v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", (unsigned long long)std); |
358 | if (std & V4L2_STD_NTSC) { | 358 | if (std & V4L2_STD_NTSC) { |
359 | vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1); | 359 | vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1); |
360 | v4l2_dbg(1, debug, sd, "norm switched to NTSC\n"); | 360 | v4l2_dbg(1, debug, sd, "norm switched to NTSC\n"); |