---

yaml --- r: 138123 b: refs/heads/master c: cc5cef8 h: refs/heads/master i: 138121: 1f0d022 138119: 1236165 v: v3
git-mirror · Mar 30, 2009 · 358c40f · 358c40f
1 parent 999101f
commit 358c40f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9185cbfc336a080695304bcb781186559d987974
+refs/heads/master: cc5cef8ea4fdc41b44007c5d2c116fe97cb87293
diff --git a/trunk/drivers/media/video/adv7170.c b/trunk/drivers/media/video/adv7170.c
@@ -195,7 +195,7 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
 {
 	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));
@@ -210,10 +210,11 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
 		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 --git a/trunk/drivers/media/video/adv7175.c b/trunk/drivers/media/video/adv7175.c
@@ -228,10 +228,11 @@ static int adv7175_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
 		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 --git a/trunk/drivers/media/video/bt819.c b/trunk/drivers/media/video/bt819.c
@@ -248,7 +248,7 @@ static int bt819_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
 	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);
@@ -267,7 +267,8 @@ static int bt819_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
 		/* 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 --git a/trunk/drivers/media/video/bt856.c b/trunk/drivers/media/video/bt856.c
@@ -125,7 +125,7 @@ static int bt856_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
 {
 	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 --git a/trunk/drivers/media/video/bt866.c b/trunk/drivers/media/video/bt866.c
@@ -91,7 +91,7 @@ static int bt866_write(struct bt866 *encoder, u8 subaddr, u8 data)
 
 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 --git a/trunk/drivers/media/video/ks0127.c b/trunk/drivers/media/video/ks0127.c
@@ -579,8 +579,8 @@ static int ks0127_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
 			/* 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 --git a/trunk/drivers/media/video/saa7110.c b/trunk/drivers/media/video/saa7110.c
@@ -251,7 +251,7 @@ static int saa7110_g_input_status(struct v4l2_subdev *sd, u32 *pstatus)
 	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 --git a/trunk/drivers/media/video/vpx3220.c b/trunk/drivers/media/video/vpx3220.c
@@ -354,7 +354,7 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
 	   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");