From fe9b8beb1f13deceb3f0b1f38e1704ee33e31a91 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 30 Aug 2008 13:08:28 -0500
Subject: pvrusb2: Handle USB ID 2040:2950 same as 2040:2900

From: Mike Isely <isely@pobox.com>

The device 2040:2950 is a really old variant of the PVR USB2 hardware.
I have just learned of its existence.  For the purposes of the pvrusb2
driver, it is functionally identical to the well known 29xxx series
(2040:2900).  Amazing that this went undetected for 3+ years.

Priority: high

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 88e175168..cbe2a3417 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -489,6 +489,8 @@ static const struct pvr2_device_desc pvr2_device_751xx = {
 struct usb_device_id pvr2_device_table[] = {
 	{ USB_DEVICE(0x2040, 0x2900),
 	  .driver_info = (kernel_ulong_t)&pvr2_device_29xxx},
+	{ USB_DEVICE(0x2040, 0x2950), /* Logically identical to 2900 */
+	  .driver_info = (kernel_ulong_t)&pvr2_device_29xxx},
 	{ USB_DEVICE(0x2040, 0x2400),
 	  .driver_info = (kernel_ulong_t)&pvr2_device_24xxx},
 	{ USB_DEVICE(0x1164, 0x0622),
-- 
cgit v1.2.3


From 1072381235b9397551ff19c608a25b47ef5c7994 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 30 Aug 2008 13:09:31 -0500
Subject: pvrusb2: Add comment elaborating on direct use of swab32()

From: Mike Isely <isely@pobox.com>

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 881610b60..70ed24e9a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1323,6 +1323,17 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
 		if (bcnt > FIRMWARE_CHUNK_SIZE) bcnt = FIRMWARE_CHUNK_SIZE;
 		memcpy(fw_ptr, fw_entry->data + fw_done, bcnt);
 		/* Usbsnoop log shows that we must swap bytes... */
+		/* Some background info: The data being swapped here is a
+		   firmware image destined for the mpeg encoder chip that
+		   lives at the other end of a USB endpoint.  The encoder
+		   chip always talks in 32 bit chunks and its storage is
+		   organized into 32 bit words.  However from the file
+		   system to the encoder chip everything is purely a byte
+		   stream.  The firmware file's contents are always 32 bit
+		   swapped from what the encoder expects.  Thus the need
+		   always exists to swap the bytes regardless of the endian
+		   type of the host processor and therefore swab32() makes
+		   the most sense. */
 		for (icnt = 0; icnt < bcnt/4 ; icnt++)
 			((u32 *)fw_ptr)[icnt] = swab32(((u32 *)fw_ptr)[icnt]);
 
-- 
cgit v1.2.3


From 3f4ff57d35135b562a224a6a2eefcbdb27aec539 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 30 Aug 2008 13:11:16 -0500
Subject: pvrusb2: Remove BKL

From: Mike Isely <isely@pobox.com>

The earlier change from Hans Verkuil that pushed the BKL from
video_open() down into the drivers should be unneeded for the pvrusb2
driver.  This driver's implementation for open already protects its
internal structures through other means, thus the BKL is not required.
This change reverses Hans' previous change, for the pvrusb2 driver.

It probably would have been a good idea for Hans to previously have
asked for my ack before committing his change.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index c1cc0e88b..1619c2756 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -933,7 +933,6 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
 	unsigned int input_cnt,idx;
 	int ret = 0;
 
-	lock_kernel();
 	dip = container_of(video_devdata(file),struct pvr2_v4l2_dev,devbase);
 
 	vp = dip->v4lp;
@@ -944,13 +943,11 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
 	if (!pvr2_hdw_dev_ok(hdw)) {
 		pvr2_trace(PVR2_TRACE_OPEN_CLOSE,
 			   "pvr2_v4l2_open: hardware not ready");
-		unlock_kernel();
 		return -EIO;
 	}
 
 	fhp = kzalloc(sizeof(*fhp),GFP_KERNEL);
 	if (!fhp) {
-		unlock_kernel();
 		return -ENOMEM;
 	}
 
@@ -980,7 +977,6 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
 			   fhp);
 
 		kfree(fhp);
-		unlock_kernel();
 		return ret;
 	}
 
@@ -997,7 +993,6 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
 			   "Destroying pvr_v4l2_fh id=%p (input map failure)",
 			   fhp);
 		kfree(fhp);
-		unlock_kernel();
 		return -ENOMEM;
 	}
 	input_cnt = 0;
@@ -1021,7 +1016,6 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
 	v4l2_prio_open(&vp->prio,&fhp->prio);
 
 	fhp->fw_mode_flag = pvr2_hdw_cpufw_get_enabled(hdw);
-	unlock_kernel();
 
 	return 0;
 }
-- 
cgit v1.2.3


From 3757649a964c5c9a327c83911dcc7743636d5e13 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 30 Aug 2008 16:11:40 -0500
Subject: pvrusb2: Fail gracefully if an alien USB ID is used

From: Mike Isely <isely@pobox.com>

The driver includes an internal table specifying additional
information on a per device-type basis.  This works great until
somebody tries to run-time associate another USB ID with the driver.
This change should hopefully allow the driver to fail gracefully under
such a circumstance.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 70ed24e9a..0fc02ce96 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1932,7 +1932,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 				 const struct usb_device_id *devid)
 {
 	unsigned int idx,cnt1,cnt2,m;
-	struct pvr2_hdw *hdw;
+	struct pvr2_hdw *hdw = NULL;
 	int valid_std_mask;
 	struct pvr2_ctrl *cptr;
 	const struct pvr2_device_desc *hdw_desc;
@@ -1942,6 +1942,16 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 
 	hdw_desc = (const struct pvr2_device_desc *)(devid->driver_info);
 
+	if (hdw_desc == NULL) {
+		pvr2_trace(PVR2_TRACE_INIT, "pvr2_hdw_create:"
+			   " No device description pointer,"
+			   " unable to continue.");
+		pvr2_trace(PVR2_TRACE_INIT, "If you have a new device type,"
+			   " please contact Mike Isely <isely@pobox.com>"
+			   " to get it included in the driver\n");
+		goto fail;
+	}
+
 	hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
 	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
 		   hdw,hdw_desc->description);
-- 
cgit v1.2.3


From d060d9f50c2929e5c5a0397843d05d0a27515b70 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 30 Aug 2008 16:26:39 -0500
Subject: pvrusb2: Implement crop support

From: vdb128@picaros.org <vdb128@picaros.org>

Implement pvrusb2 driver plumbing to support cropping.  Submitted by a
pvrusb2 user.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 .../media/video/pvrusb2/pvrusb2-hdw-internal.h     |   5 +
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c    | 119 +++++++++++++++++++++
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h    |   4 +
 .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c   |   7 +-
 .../media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c     |  49 +++++++++
 .../media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h     |   1 +
 6 files changed, 183 insertions(+), 2 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 657f86159..0453244b7 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -319,6 +319,7 @@ struct pvr2_hdw {
 	struct pvr2_ctl_info std_info_cur;
 	struct v4l2_standard *std_defs;
 	const char **std_enum_names;
+	struct v4l2_cropcap cropcap;
 
 	// Generated string names, one per actual V4L2 standard
 	const char *std_mask_ptrs[32];
@@ -367,6 +368,10 @@ struct pvr2_hdw {
 	VCREATE_DATA(bass);
 	VCREATE_DATA(treble);
 	VCREATE_DATA(mute);
+	VCREATE_DATA(cropl);
+	VCREATE_DATA(cropt);
+	VCREATE_DATA(cropw);
+	VCREATE_DATA(croph);
 	VCREATE_DATA(input);
 	VCREATE_DATA(audiomode);
 	VCREATE_DATA(res_hor);
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 0fc02ce96..6513139ee 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -403,6 +403,52 @@ static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)
 	return 0;
 }
 
+static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
+	if (cap->bounds.width > 0) {
+		/* This statement is present purely to shut up
+		   checkpatch.pl */
+		*left = cap->bounds.left - cap->defrect.left;
+	} else {
+		/* This statement is present purely to shut up
+		   checkpatch.pl */
+		*left = -119;
+	}
+	return 0;
+}
+
+static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
+	if (cap->bounds.width > 0) {
+		*left = cap->bounds.left + cap->bounds.width
+			- cap->defrect.left;
+		*left += 3;
+		*left -= cptr->hdw->cropw_val;
+	} else {
+		/* This statement is present purely to shut up
+		   checkpatch.pl */
+		*left = 340;
+	}
+	return 0;
+}
+
+static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
+	if (cap->bounds.height > 0) {
+		/* This statement is present purely to shut up
+		   checkpatch.pl */
+		*top = cap->bounds.top - cap->defrect.top;
+	} else {
+		/* This statement is present purely to shut up
+		   checkpatch.pl */
+		*top = -19;
+	}
+	return 0;
+}
+
 static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
 {
 	/* Actual maximum depends on the video standard in effect. */
@@ -414,6 +460,19 @@ static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
 	return 0;
 }
 
+static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
+	if (cap->bounds.height > 0) {
+		*top = cap->bounds.top + cap->bounds.height - cap->defrect.top;
+		*top -= cptr->hdw->croph_val;
+	} else {
+		ctrl_vres_max_get(cptr, top);
+		*top -= 32;
+	}
+	return 0;
+}
+
 static int ctrl_vres_min_get(struct pvr2_ctrl *cptr,int *vp)
 {
 	/* Actual minimum depends on device digitizer type. */
@@ -780,6 +839,10 @@ VCREATE_FUNCS(balance)
 VCREATE_FUNCS(bass)
 VCREATE_FUNCS(treble)
 VCREATE_FUNCS(mute)
+VCREATE_FUNCS(cropl)
+VCREATE_FUNCS(cropt)
+VCREATE_FUNCS(cropw)
+VCREATE_FUNCS(croph)
 VCREATE_FUNCS(audiomode)
 VCREATE_FUNCS(res_hor)
 VCREATE_FUNCS(res_ver)
@@ -850,6 +913,39 @@ static const struct pvr2_ctl_info control_defs[] = {
 		.default_value = 0,
 		DEFREF(mute),
 		DEFBOOL,
+	}, {
+		.desc = "Capture left margin",
+		.name = "crop_left",
+		.internal_id = PVR2_CID_CROPL,
+		.default_value = 0,
+		DEFREF(cropl),
+		DEFINT(-129, 340),
+		.get_min_value = ctrl_cropl_min_get,
+		.get_max_value = ctrl_cropl_max_get,
+	}, {
+		.desc = "Capture top margin",
+		.name = "crop_top",
+		.internal_id = PVR2_CID_CROPT,
+		.default_value = 0,
+		DEFREF(cropt),
+		DEFINT(-35, 544),
+		.get_min_value = ctrl_cropt_min_get,
+		.get_max_value = ctrl_cropt_max_get,
+	}, {
+		.desc = "Capture width",
+		.name = "crop_width",
+		.internal_id = PVR2_CID_CROPW,
+		.default_value = 720,
+		DEFREF(cropw),
+		DEFINT(388, 849), /* determined empirically, any res_hor>=64 */
+	}, {
+		.desc = "Capture height",
+		.name = "crop_height",
+		.internal_id = PVR2_CID_CROPH,
+		.default_value = 480,
+		DEFREF(croph),
+		DEFINT(32, 576),
+		.get_max_value = ctrl_vres_max_get,
 	},{
 		.desc = "Video Source",
 		.name = "input",
@@ -2109,6 +2205,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 			valid_std_mask;
 	}
 
+	memset(&hdw->cropcap, 0, sizeof hdw->cropcap);
 	hdw->eeprom_addr = -1;
 	hdw->unit_number = -1;
 	hdw->v4l_minor_number_video = -1;
@@ -2552,6 +2649,28 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
 		/* Can't commit anything until pathway is ok. */
 		return 0;
 	}
+	/* The broadcast decoder can only scale down, so if
+	 * res_*_dirty && crop window < output format ==> enlarge crop.
+	 *
+	 * The mpeg encoder receives fields of res_hor_val dots and
+	 * res_ver_val halflines.  Limits: hor<=720, ver<=576.
+	 */
+	if (hdw->res_hor_dirty && hdw->cropw_val < hdw->res_hor_val) {
+		hdw->cropw_val = hdw->res_hor_val;
+		hdw->cropw_dirty = !0;
+	} else if (hdw->cropw_dirty) {
+		hdw->res_hor_dirty = !0;           /* must rescale */
+		hdw->res_hor_val = min(720, hdw->cropw_val);
+	}
+	if (hdw->res_ver_dirty && hdw->croph_val < hdw->res_ver_val) {
+		hdw->croph_val = hdw->res_ver_val;
+		hdw->croph_dirty = !0;
+	} else if (hdw->croph_dirty) {
+		int nvres = hdw->std_mask_cur & V4L2_STD_525_60 ? 480 : 576;
+		hdw->res_ver_dirty = !0;
+		hdw->res_ver_val = min(nvres, hdw->croph_val);
+	}
+
 	/* If any of the below has changed, then we can't do the update
 	   while the pipeline is running.  Pipeline must be paused first
 	   and decoder -> encoder connection be made quiescent before we
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 4e60f6262..0c3ae2586 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -37,6 +37,10 @@
 #define PVR2_CID_FREQUENCY 6
 #define PVR2_CID_HRES 7
 #define PVR2_CID_VRES 8
+#define PVR2_CID_CROPL 9
+#define PVR2_CID_CROPT 10
+#define PVR2_CID_CROPW 11
+#define PVR2_CID_CROPH 12
 
 /* Legal values for the INPUT state variable */
 #define PVR2_CVAL_INPUT_TV 0
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 25e611b2e..1b1424955 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -38,8 +38,9 @@
 #define OP_VOLUME 3
 #define OP_FREQ 4
 #define OP_AUDIORATE 5
-#define OP_SIZE 6
-#define OP_LOG 7
+#define OP_CROP 6
+#define OP_SIZE 7
+#define OP_LOG 8
 
 static const struct pvr2_i2c_op * const ops[] = {
 	[OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -47,6 +48,7 @@ static const struct pvr2_i2c_op * const ops[] = {
 	[OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh,
 	[OP_VOLUME] = &pvr2_i2c_op_v4l2_volume,
 	[OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
+	[OP_CROP] = &pvr2_i2c_op_v4l2_crop,
 	[OP_SIZE] = &pvr2_i2c_op_v4l2_size,
 	[OP_LOG] = &pvr2_i2c_op_v4l2_log,
 };
@@ -60,6 +62,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 			(1 << OP_BCSH) |
 			(1 << OP_VOLUME) |
 			(1 << OP_FREQ) |
+			(1 << OP_CROP) |
 			(1 << OP_SIZE) |
 			(1 << OP_LOG));
 	cp->status_poll = pvr2_v4l2_cmd_status_poll;
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index d715c80ef..602bc5309 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -234,6 +234,55 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {
 };
 
 
+static void set_crop(struct pvr2_hdw *hdw)
+{
+	struct v4l2_cropcap cap;
+	struct v4l2_crop crop;
+	int stat;
+
+	memset(&cap, 0, sizeof cap);
+	cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	stat = pvr2_i2c_core_cmd(hdw, VIDIOC_CROPCAP, &cap);
+	hdw->cropcap = cap;
+
+	memset(&crop, 0, sizeof crop);
+	crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	crop.c = cap.defrect;
+	crop.c.left += hdw->cropl_val;
+	crop.c.top += hdw->cropt_val;
+	crop.c.height = hdw->croph_val;
+	crop.c.width = hdw->cropw_val;
+
+	pvr2_trace(PVR2_TRACE_CHIPS,
+		   "i2c v4l2 set_crop stat=%d cap=%d:%d:%d:%d"
+		   " crop=%d:%d:%d:%d", stat, cap.bounds.width,
+		   cap.bounds.height, cap.bounds.left, cap.bounds.top,
+		   crop.c.width, crop.c.height, crop.c.left, crop.c.top);
+
+	if (stat >= 0) {
+		/* This comment is present purely to keep
+		   checkpatch.pl quiet */
+		pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &crop);
+	}
+}
+
+static int check_crop(struct pvr2_hdw *hdw)
+{
+	/* The "0 +" stupidity is present only to get checkpatch.pl to
+	   shut up.  I _want_ those parantheses present so that the
+	   two lines automatically line up in my editor.  I despise
+	   checkpatch.pl. */
+	return 0 + (hdw->cropl_dirty || hdw->cropt_dirty ||
+		    hdw->cropw_dirty || hdw->croph_dirty);
+}
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop = {
+	.check = check_crop,
+	.update = set_crop,
+	.name = "v4l2_crop",
+};
+
+
 static void do_log(struct pvr2_hdw *hdw)
 {
 	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()");
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index 7fa38683b..eb744a206 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -29,6 +29,7 @@ extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;
-- 
cgit v1.2.3


From a397e1f70d7ece4029a16e5bda4f556467252a8c Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 31 Aug 2008 18:50:59 -0500
Subject: pvrusb2: Mark crop window size change as being disruptive to the
 encoder

From: Mike Isely <isely@pobox.com>

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 6513139ee..9bdb3577a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2681,6 +2681,8 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
 		 hdw->srate_dirty ||
 		 hdw->res_ver_dirty ||
 		 hdw->res_hor_dirty ||
+		 hdw->cropw_dirty ||
+		 hdw->croph_dirty ||
 		 hdw->input_dirty ||
 		 (hdw->active_stream_type != hdw->desired_stream_type));
 	if (disruptive_change && !hdw->state_pipeline_idle) {
-- 
cgit v1.2.3


From 596acdb938b1e1c2f61c0bddc1359ce91d3f4db2 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 31 Aug 2008 18:55:03 -0500
Subject: pvrusb2: Be able to programmatically retrieve a control's default
 value

From: Mike Isely <isely@pobox.com>

The pvrusb2 control mechanism up until now has used a constant int to
hold a control's default value.  This change makes it possible to
retrieve the control's default through some other means, e.g. as a
result of a query from lower level software.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c         | 10 ++++++++--
 linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.h         |  2 +-
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |  1 +
 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |  8 +++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 3b982d963..fb2ed3cb7 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -135,13 +135,19 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
 
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr)
+int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 {
 	int ret = 0;
 	if (!cptr) return 0;
 	LOCK_TAKE(cptr->hdw->big_lock); do {
 		if (cptr->info->type == pvr2_ctl_int) {
-			ret = cptr->info->default_value;
+			if (cptr->info->get_def_value) {
+				/* Comment to keep checkpatch.pl quiet */
+				ret = cptr->info->get_def_value(cptr, valptr);
+			} else {
+				/* Comment to keep checkpatch.pl quiet */
+				*valptr = cptr->info->default_value;
+			}
 		}
 	} while(0); LOCK_GIVE(cptr->hdw->big_lock);
 	return ret;
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
index 0371ae6e6..794ff9012 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
@@ -49,7 +49,7 @@ int pvr2_ctrl_get_max(struct pvr2_ctrl *);
 int pvr2_ctrl_get_min(struct pvr2_ctrl *);
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *);
+int pvr2_ctrl_get_def(struct pvr2_ctrl *, int *valptr);
 
 /* Retrieve control's enumeration count (enum only) */
 int pvr2_ctrl_get_cnt(struct pvr2_ctrl *);
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 0453244b7..8bc966973 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -82,6 +82,7 @@ struct pvr2_ctl_info {
 
 	/* Control's implementation */
 	pvr2_ctlf_get_value get_value;      /* Get its value */
+	pvr2_ctlf_get_value get_def_value;  /* Get its default value */
 	pvr2_ctlf_get_value get_min_value;  /* Get minimum allowed value */
 	pvr2_ctlf_get_value get_max_value;  /* Get maximum allowed value */
 	pvr2_ctlf_set_value set_value;      /* Set its value */
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 1619c2756..34276b296 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -534,7 +534,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
 			lmin = pvr2_ctrl_get_min(hcp);
 			lmax = pvr2_ctrl_get_max(hcp);
-			ldef = pvr2_ctrl_get_def(hcp);
+			pvr2_ctrl_get_def(hcp, &ldef);
 			if (w == -1) {
 				w = ldef;
 			} else if (w < lmin) {
@@ -544,7 +544,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 			}
 			lmin = pvr2_ctrl_get_min(vcp);
 			lmax = pvr2_ctrl_get_max(vcp);
-			ldef = pvr2_ctrl_get_def(vcp);
+			pvr2_ctrl_get_def(vcp, &ldef);
 			if (h == -1) {
 				h = ldef;
 			} else if (h < lmin) {
@@ -605,6 +605,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 	case VIDIOC_QUERYCTRL:
 	{
 		struct pvr2_ctrl *cptr;
+		int val;
 		struct v4l2_queryctrl *vc = (struct v4l2_queryctrl *)arg;
 		ret = 0;
 		if (vc->id & V4L2_CTRL_FLAG_NEXT_CTRL) {
@@ -628,7 +629,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 			   pvr2_ctrl_get_desc(cptr));
 		strlcpy(vc->name,pvr2_ctrl_get_desc(cptr),sizeof(vc->name));
 		vc->flags = pvr2_ctrl_get_v4lflags(cptr);
-		vc->default_value = pvr2_ctrl_get_def(cptr);
+		pvr2_ctrl_get_def(cptr, &val);
+		vc->default_value = val;
 		switch (pvr2_ctrl_get_type(cptr)) {
 		case pvr2_ctl_enum:
 			vc->type = V4L2_CTRL_TYPE_MENU;
-- 
cgit v1.2.3


From d9d08459ac669feff9a869bd20095d379e897f9d Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 31 Aug 2008 18:57:54 -0500
Subject: pvrusb2: Implement default value retrieval in sysfs interface

From: Mike Isely <isely@pobox.com>

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 90cb36435..b50565d27 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -66,6 +66,7 @@ struct pvr2_sysfs_ctl_item {
 	struct device_attribute attr_type;
 	struct device_attribute attr_min;
 	struct device_attribute attr_max;
+	struct device_attribute attr_def;
 	struct device_attribute attr_enum;
 	struct device_attribute attr_bits;
 	struct device_attribute attr_val;
@@ -146,6 +147,24 @@ static ssize_t show_max(struct device *class_dev,
 	return scnprintf(buf, PAGE_SIZE, "%ld\n", val);
 }
 
+static ssize_t show_def(struct device *class_dev,
+			struct device_attribute *attr,
+			char *buf)
+{
+	struct pvr2_sysfs_ctl_item *cip;
+	int val;
+	int ret;
+	cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);
+	ret = pvr2_ctrl_get_def(cip->cptr, &val);
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
+			 cip->chptr, cip->ctl_id, val, ret);
+	if (ret < 0) {
+		/* Keep checkpatch.pl quiet */
+		return ret;
+	}
+	return scnprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+
 static ssize_t show_val_norm(struct device *class_dev,
 			     struct device_attribute *attr,
 			     char *buf)
@@ -321,6 +340,10 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 	cip->attr_max.attr.mode = S_IRUGO;
 	cip->attr_max.show = show_max;
 
+	cip->attr_def.attr.name = "def_val";
+	cip->attr_def.attr.mode = S_IRUGO;
+	cip->attr_def.show = show_def;
+
 	cip->attr_val.attr.name = "cur_val";
 	cip->attr_val.attr.mode = S_IRUGO;
 
@@ -344,6 +367,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 	cip->attr_gen[acnt++] = &cip->attr_name.attr;
 	cip->attr_gen[acnt++] = &cip->attr_type.attr;
 	cip->attr_gen[acnt++] = &cip->attr_val.attr;
+	cip->attr_gen[acnt++] = &cip->attr_def.attr;
 	cip->attr_val.show = show_val_norm;
 	cip->attr_val.store = store_val_norm;
 	if (pvr2_ctrl_has_custom_symbols(cptr)) {
-- 
cgit v1.2.3


From 75972dbbf8b51c578c919ae4f6d7255607286971 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 31 Aug 2008 19:02:20 -0500
Subject: pvrusb2: Implement cropping pass through

From: Mike Isely <isely@pobox.com>

This builds upon the previous pvrusb2 change to more formally
implement full cropping support.  This enables access from the
driver's V4L interface, and enables access to full capabilities from
sysfs as well.  Note that this is only effective when in analog mode.
It also will only work when the underlying digitizer's driver (saa7115
or cx25840 depending on the hardware) also implements the appropriate
functions.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 .../media/video/pvrusb2/pvrusb2-hdw-internal.h     |   5 +-
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c    | 311 +++++++++++++++++----
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h    |   9 +
 .../media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c     |  37 ++-
 .../drivers/media/video/pvrusb2/pvrusb2-i2c-core.c |   2 +
 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c   |  86 ++++++
 6 files changed, 383 insertions(+), 67 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 8bc966973..de7ee7264 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -308,6 +308,10 @@ struct pvr2_hdw {
 	struct v4l2_tuner tuner_signal_info;
 	int tuner_signal_stale;
 
+	/* Cropping capability info */
+	struct v4l2_cropcap cropcap_info;
+	int cropcap_stale;
+
 	/* Video standard handling */
 	v4l2_std_id std_mask_eeprom; // Hardware supported selections
 	v4l2_std_id std_mask_avail;  // Which standards we may select from
@@ -320,7 +324,6 @@ struct pvr2_hdw {
 	struct pvr2_ctl_info std_info_cur;
 	struct v4l2_standard *std_defs;
 	const char **std_enum_names;
-	struct v4l2_cropcap cropcap;
 
 	// Generated string names, one per actual V4L2 standard
 	const char *std_mask_ptrs[32];
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 9bdb3577a..a517fd6f8 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -299,6 +299,7 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
 				unsigned int timeout,int probe_fl,
 				void *write_data,unsigned int write_len,
 				void *read_data,unsigned int read_len);
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw);
 
 
 static void trace_stbit(const char *name,int val)
@@ -405,70 +406,220 @@ static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)
 
 static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)
 {
-	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
-	if (cap->bounds.width > 0) {
-		/* This statement is present purely to shut up
-		   checkpatch.pl */
-		*left = cap->bounds.left - cap->defrect.left;
-	} else {
-		/* This statement is present purely to shut up
-		   checkpatch.pl */
-		*left = -119;
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
 	}
+	*left = cap->bounds.left;
 	return 0;
 }
 
 static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)
 {
-	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
-	if (cap->bounds.width > 0) {
-		*left = cap->bounds.left + cap->bounds.width
-			- cap->defrect.left;
-		*left += 3;
-		*left -= cptr->hdw->cropw_val;
-	} else {
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*left = cap->bounds.left;
+	if (cap->bounds.width > cptr->hdw->cropw_val) {
 		/* This statement is present purely to shut up
 		   checkpatch.pl */
-		*left = 340;
+		*left += cap->bounds.width - cptr->hdw->cropw_val;
 	}
 	return 0;
 }
 
 static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)
 {
-	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
-	if (cap->bounds.height > 0) {
-		/* This statement is present purely to shut up
-		   checkpatch.pl */
-		*top = cap->bounds.top - cap->defrect.top;
-	} else {
-		/* This statement is present purely to shut up
-		   checkpatch.pl */
-		*top = -19;
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
 	}
+	*top = cap->bounds.top;
 	return 0;
 }
 
-static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
+static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
 {
-	/* Actual maximum depends on the video standard in effect. */
-	if (cptr->hdw->std_mask_cur & V4L2_STD_525_60) {
-		*vp = 480;
-	} else {
-		*vp = 576;
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*top = cap->bounds.top;
+	if (cap->bounds.height > cptr->hdw->croph_val) {
+		/* Keep checkpatch.pl quiet */
+		*top += cap->bounds.height - cptr->hdw->croph_val;
 	}
 	return 0;
 }
 
-static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
+static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val)
 {
-	struct v4l2_cropcap *cap = &cptr->hdw->cropcap;
-	if (cap->bounds.height > 0) {
-		*top = cap->bounds.top + cap->bounds.height - cap->defrect.top;
-		*top -= cptr->hdw->croph_val;
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = 0;
+	if (cap->bounds.width > cptr->hdw->cropl_val) {
+		/* Keep checkpatch.pl quiet */
+		*val = cap->bounds.width - cptr->hdw->cropl_val;
+	}
+	return 0;
+}
+
+static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = 0;
+	if (cap->bounds.height > cptr->hdw->cropt_val) {
+		/* Keep checkpatch.pl quiet */
+		*val = cap->bounds.height - cptr->hdw->cropt_val;
+	}
+	return 0;
+}
+
+static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->bounds.left;
+	return 0;
+}
+
+static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->bounds.top;
+	return 0;
+}
+
+static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->bounds.width;
+	return 0;
+}
+
+static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->bounds.height;
+	return 0;
+}
+
+static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->defrect.left;
+	return 0;
+}
+
+static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->defrect.top;
+	return 0;
+}
+
+static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->defrect.width;
+	return 0;
+}
+
+static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->defrect.height;
+	return 0;
+}
+
+static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->pixelaspect.numerator;
+	return 0;
+}
+
+static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val)
+{
+	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+	if (stat != 0) {
+		/* Keep checkpatch.pl quiet */
+		return stat;
+	}
+	*val = cap->pixelaspect.denominator;
+	return 0;
+}
+
+static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
+{
+	/* Actual maximum depends on the video standard in effect. */
+	if (cptr->hdw->std_mask_cur & V4L2_STD_525_60) {
+		*vp = 480;
 	} else {
-		ctrl_vres_max_get(cptr, top);
-		*top -= 32;
+		*vp = 576;
 	}
 	return 0;
 }
@@ -914,7 +1065,7 @@ static const struct pvr2_ctl_info control_defs[] = {
 		DEFREF(mute),
 		DEFBOOL,
 	}, {
-		.desc = "Capture left margin",
+		.desc = "Capture crop left margin",
 		.name = "crop_left",
 		.internal_id = PVR2_CID_CROPL,
 		.default_value = 0,
@@ -922,8 +1073,9 @@ static const struct pvr2_ctl_info control_defs[] = {
 		DEFINT(-129, 340),
 		.get_min_value = ctrl_cropl_min_get,
 		.get_max_value = ctrl_cropl_max_get,
+		.get_def_value = ctrl_get_cropcapdl,
 	}, {
-		.desc = "Capture top margin",
+		.desc = "Capture crop top margin",
 		.name = "crop_top",
 		.internal_id = PVR2_CID_CROPT,
 		.default_value = 0,
@@ -931,21 +1083,53 @@ static const struct pvr2_ctl_info control_defs[] = {
 		DEFINT(-35, 544),
 		.get_min_value = ctrl_cropt_min_get,
 		.get_max_value = ctrl_cropt_max_get,
+		.get_def_value = ctrl_get_cropcapdt,
 	}, {
-		.desc = "Capture width",
+		.desc = "Capture crop width",
 		.name = "crop_width",
 		.internal_id = PVR2_CID_CROPW,
 		.default_value = 720,
 		DEFREF(cropw),
-		DEFINT(388, 849), /* determined empirically, any res_hor>=64 */
+		.get_max_value = ctrl_cropw_max_get,
+		.get_def_value = ctrl_get_cropcapdw,
 	}, {
-		.desc = "Capture height",
+		.desc = "Capture crop height",
 		.name = "crop_height",
 		.internal_id = PVR2_CID_CROPH,
 		.default_value = 480,
 		DEFREF(croph),
-		DEFINT(32, 576),
-		.get_max_value = ctrl_vres_max_get,
+		.get_max_value = ctrl_croph_max_get,
+		.get_def_value = ctrl_get_cropcapdh,
+	}, {
+		.desc = "Capture capability pixel aspect numerator",
+		.name = "cropcap_pixel_numerator",
+		.internal_id = PVR2_CID_CROPCAPPAN,
+		.get_value = ctrl_get_cropcappan,
+	}, {
+		.desc = "Capture capability pixel aspect denominator",
+		.name = "cropcap_pixel_denominator",
+		.internal_id = PVR2_CID_CROPCAPPAD,
+		.get_value = ctrl_get_cropcappad,
+	}, {
+		.desc = "Capture capability bounds top",
+		.name = "cropcap_bounds_top",
+		.internal_id = PVR2_CID_CROPCAPBT,
+		.get_value = ctrl_get_cropcapbt,
+	}, {
+		.desc = "Capture capability bounds left",
+		.name = "cropcap_bounds_left",
+		.internal_id = PVR2_CID_CROPCAPBL,
+		.get_value = ctrl_get_cropcapbl,
+	}, {
+		.desc = "Capture capability bounds width",
+		.name = "cropcap_bounds_width",
+		.internal_id = PVR2_CID_CROPCAPBW,
+		.get_value = ctrl_get_cropcapbw,
+	}, {
+		.desc = "Capture capability bounds height",
+		.name = "cropcap_bounds_height",
+		.internal_id = PVR2_CID_CROPCAPBH,
+		.get_value = ctrl_get_cropcapbh,
 	},{
 		.desc = "Video Source",
 		.name = "input",
@@ -2205,7 +2389,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 			valid_std_mask;
 	}
 
-	memset(&hdw->cropcap, 0, sizeof hdw->cropcap);
+	hdw->cropcap_stale = !0;
 	hdw->eeprom_addr = -1;
 	hdw->unit_number = -1;
 	hdw->v4l_minor_number_video = -1;
@@ -2752,6 +2936,9 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
 	}
 
 	hdw->state_pipeline_config = !0;
+	/* Hardware state may have changed in a way to cause the cropping
+	   capabilities to have changed.  So mark it stale, which will
+	   cause a later re-fetch. */
 	trace_stbit("state_pipeline_config",hdw->state_pipeline_config);
 	return !0;
 }
@@ -2842,6 +3029,36 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)
 }
 
 
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw)
+{
+	if (!hdw->cropcap_stale) {
+		/* Keep checkpatch.pl quiet */
+		return 0;
+	}
+	pvr2_i2c_core_status_poll(hdw);
+	if (hdw->cropcap_stale) {
+		/* Keep checkpatch.pl quiet */
+		return -EIO;
+	}
+	return 0;
+}
+
+
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp)
+{
+	int stat = 0;
+	LOCK_TAKE(hdw->big_lock);
+	stat = pvr2_hdw_check_cropcap(hdw);
+	if (!stat) {
+		/* Keep checkpatch.pl quiet */
+		memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info));
+	}
+	LOCK_GIVE(hdw->big_lock);
+	return stat;
+}
+
+
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *hdw,struct v4l2_tuner *vtp)
 {
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 0c3ae2586..29fb0729d 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -41,6 +41,12 @@
 #define PVR2_CID_CROPT 10
 #define PVR2_CID_CROPW 11
 #define PVR2_CID_CROPH 12
+#define PVR2_CID_CROPCAPPAN 13
+#define PVR2_CID_CROPCAPPAD 14
+#define PVR2_CID_CROPCAPBL 15
+#define PVR2_CID_CROPCAPBT 16
+#define PVR2_CID_CROPCAPBW 17
+#define PVR2_CID_CROPCAPBH 18
 
 /* Legal values for the INPUT state variable */
 #define PVR2_CVAL_INPUT_TV 0
@@ -180,6 +186,9 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *);
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *,struct v4l2_tuner *);
 
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *, struct v4l2_cropcap *);
+
 /* Query device and see if it thinks it is on a high-speed USB link */
 int pvr2_hdw_is_hsm(struct pvr2_hdw *);
 
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 602bc5309..ae2ee9b59 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -38,6 +38,7 @@ static void set_standard(struct pvr2_hdw *hdw)
 		pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
 	}
 	hdw->tuner_signal_stale = !0;
+	hdw->cropcap_stale = !0;
 }
 
 
@@ -236,34 +237,20 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {
 
 static void set_crop(struct pvr2_hdw *hdw)
 {
-	struct v4l2_cropcap cap;
 	struct v4l2_crop crop;
-	int stat;
-
-	memset(&cap, 0, sizeof cap);
-	cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	stat = pvr2_i2c_core_cmd(hdw, VIDIOC_CROPCAP, &cap);
-	hdw->cropcap = cap;
 
 	memset(&crop, 0, sizeof crop);
 	crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	crop.c = cap.defrect;
-	crop.c.left += hdw->cropl_val;
-	crop.c.top += hdw->cropt_val;
+	crop.c.left = hdw->cropl_val;
+	crop.c.top = hdw->cropt_val;
 	crop.c.height = hdw->croph_val;
 	crop.c.width = hdw->cropw_val;
 
 	pvr2_trace(PVR2_TRACE_CHIPS,
-		   "i2c v4l2 set_crop stat=%d cap=%d:%d:%d:%d"
-		   " crop=%d:%d:%d:%d", stat, cap.bounds.width,
-		   cap.bounds.height, cap.bounds.left, cap.bounds.top,
+		   "i2c v4l2 set_crop crop=%d:%d:%d:%d",
 		   crop.c.width, crop.c.height, crop.c.left, crop.c.top);
 
-	if (stat >= 0) {
-		/* This comment is present purely to keep
-		   checkpatch.pl quiet */
-		pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &crop);
-	}
+	pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &crop);
 }
 
 static int check_crop(struct pvr2_hdw *hdw)
@@ -313,7 +300,19 @@ void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)
 
 void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *cp)
 {
-	pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&cp->hdw->tuner_signal_info);
+	int stat;
+	struct pvr2_hdw *hdw = cp->hdw;
+	if (hdw->cropcap_stale) {
+		hdw->cropcap_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+		stat = pvr2_i2c_client_cmd(cp, VIDIOC_CROPCAP,
+					   &hdw->cropcap_info);
+		if (stat == 0) {
+			/* Check was successful, so the data is no
+			   longer considered stale. */
+			hdw->cropcap_stale = 0;
+		}
+	}
+	pvr2_i2c_client_cmd(cp, VIDIOC_G_TUNER, &hdw->tuner_signal_info);
 }
 
 
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 9159686c3..6db7dd2b7 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -966,6 +966,7 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client)
 	INIT_LIST_HEAD(&cp->list);
 	cp->client = client;
 	mutex_lock(&hdw->i2c_list_lock); do {
+		hdw->cropcap_stale = !0;
 		list_add_tail(&cp->list,&hdw->i2c_clients);
 		hdw->i2c_pend_types |= PVR2_I2C_PEND_DETECT;
 	} while (0); mutex_unlock(&hdw->i2c_list_lock);
@@ -980,6 +981,7 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client)
 	unsigned long amask = 0;
 	int foundfl = 0;
 	mutex_lock(&hdw->i2c_list_lock); do {
+		hdw->cropcap_stale = !0;
 		list_for_each_entry_safe(cp, ncp, &hdw->i2c_clients, list) {
 			if (cp->client == client) {
 				trace_i2c("pvr2_i2c_detach"
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 34276b296..429c96d4f 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -756,6 +756,92 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 		break;
 	}
 
+	case VIDIOC_CROPCAP:
+	{
+		struct v4l2_cropcap *cap = (struct v4l2_cropcap *)arg;
+		if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+			ret = -EINVAL;
+			break;
+		}
+		ret = pvr2_hdw_get_cropcap(hdw, cap);
+		cap->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; /* paranoia */
+		break;
+	}
+	case VIDIOC_G_CROP:
+	{
+		struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+		int val = 0;
+		if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+			ret = -EINVAL;
+			break;
+		}
+		ret = pvr2_ctrl_get_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), &val);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		crop->c.left = val;
+		ret = pvr2_ctrl_get_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT), &val);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		crop->c.top = val;
+		ret = pvr2_ctrl_get_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW), &val);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		crop->c.width = val;
+		ret = pvr2_ctrl_get_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH), &val);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		crop->c.height = val;
+	}
+	case VIDIOC_S_CROP:
+	{
+		struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+		struct v4l2_cropcap cap;
+		if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+			ret = -EINVAL;
+			break;
+		}
+		cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+		ret = pvr2_ctrl_set_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL),
+			crop->c.left);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		ret = pvr2_ctrl_set_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT),
+			crop->c.top);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		ret = pvr2_ctrl_set_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW),
+			crop->c.width);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+		ret = pvr2_ctrl_set_value(
+			pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH),
+			crop->c.height);
+		if (ret != 0) {
+			ret = -EINVAL;
+			break;
+		}
+	}
 	case VIDIOC_LOG_STATUS:
 	{
 		pvr2_hdw_trigger_module_log(hdw);
-- 
cgit v1.2.3


From bf24b84bec9d580cdce21b3fd6837d1f906cc98c Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 31 Aug 2008 19:06:11 -0500
Subject: pvrusb2: Disable virtual IR device when not needed.

From: Mike Isely <isely@pobox.com>

Disable "virtual" IR receiver on for 24xxx devices that have an
internal IR blaster.  In that case there's another another IR
receiver present and to leave the virtual receiver available
just causes confusion.  This means that 24xxx users will no
longer see a phantom IR chip.

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 .../drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 36 +++++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 6db7dd2b7..6161657af 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -1023,22 +1023,32 @@ static struct i2c_adapter pvr2_i2c_adap_template = {
 	.client_unregister = pvr2_i2c_detach_inform,
 };
 
-static void do_i2c_scan(struct pvr2_hdw *hdw)
+
+/* Return true if device exists at given address */
+static int do_i2c_probe(struct pvr2_hdw *hdw, int addr)
 {
 	struct i2c_msg msg[1];
-	int i,rc;
+	int rc;
 	msg[0].addr = 0;
 	msg[0].flags = I2C_M_RD;
 	msg[0].len = 0;
 	msg[0].buf = NULL;
-	printk("%s: i2c scan beginning\n",hdw->name);
+	msg[0].addr = addr;
+	rc = i2c_transfer(&hdw->i2c_adap, msg, ARRAY_SIZE(msg));
+	return rc == 1;
+}
+
+static void do_i2c_scan(struct pvr2_hdw *hdw)
+{
+	int i;
+	printk(KERN_INFO "%s: i2c scan beginning\n", hdw->name);
 	for (i = 0; i < 128; i++) {
-		msg[0].addr = i;
-		rc = i2c_transfer(&hdw->i2c_adap,msg, ARRAY_SIZE(msg));
-		if (rc != 1) continue;
-		printk("%s: i2c scan: found device @ 0x%x\n",hdw->name,i);
+		if (do_i2c_probe(hdw, i)) {
+			printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n",
+			       hdw->name, i);
+		}
 	}
-	printk("%s: i2c scan done.\n",hdw->name);
+	printk(KERN_INFO "%s: i2c scan done.\n", hdw->name);
 }
 
 void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
@@ -1083,6 +1093,16 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
 	mutex_init(&hdw->i2c_list_lock);
 	hdw->i2c_linked = !0;
 	i2c_add_adapter(&hdw->i2c_adap);
+	if (hdw->i2c_func[0x18] == i2c_24xxx_ir) {
+		/* Probe for a different type of IR receiver on this
+		   device.  If present, disable the emulated IR receiver. */
+		if (do_i2c_probe(hdw, 0x71)) {
+			pvr2_trace(PVR2_TRACE_INFO,
+				   "Device has newer IR hardware;"
+				   " disabling unneeded virtual IR device");
+			hdw->i2c_func[0x18] = NULL;
+		}
+	}
 	if (i2c_scan) do_i2c_scan(hdw);
 }
 
-- 
cgit v1.2.3


From 12c70bef2716d26428bef48eda3454759453651c Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Wed, 3 Sep 2008 19:51:59 -0500
Subject: pvrusb2: Remove comment lines which refer to checkpatch's behavior

From: Mike Isely <isely@pobox.com>

Priority: normal

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c   |  2 --
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c    | 24 ----------------------
 .../media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c     |  8 ++------
 .../drivers/media/video/pvrusb2/pvrusb2-i2c-core.c |  2 --
 linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c  |  1 -
 5 files changed, 2 insertions(+), 35 deletions(-)

(limited to 'linux/drivers/media/video/pvrusb2')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index fb2ed3cb7..5fa8af50b 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -142,10 +142,8 @@ int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 	LOCK_TAKE(cptr->hdw->big_lock); do {
 		if (cptr->info->type == pvr2_ctl_int) {
 			if (cptr->info->get_def_value) {
-				/* Comment to keep checkpatch.pl quiet */
 				ret = cptr->info->get_def_value(cptr, valptr);
 			} else {
-				/* Comment to keep checkpatch.pl quiet */
 				*valptr = cptr->info->default_value;
 			}
 		}
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index a517fd6f8..b79829f8a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -409,7 +409,6 @@ static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*left = cap->bounds.left;
@@ -421,13 +420,10 @@ static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*left = cap->bounds.left;
 	if (cap->bounds.width > cptr->hdw->cropw_val) {
-		/* This statement is present purely to shut up
-		   checkpatch.pl */
 		*left += cap->bounds.width - cptr->hdw->cropw_val;
 	}
 	return 0;
@@ -438,7 +434,6 @@ static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*top = cap->bounds.top;
@@ -450,12 +445,10 @@ static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*top = cap->bounds.top;
 	if (cap->bounds.height > cptr->hdw->croph_val) {
-		/* Keep checkpatch.pl quiet */
 		*top += cap->bounds.height - cptr->hdw->croph_val;
 	}
 	return 0;
@@ -466,12 +459,10 @@ static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = 0;
 	if (cap->bounds.width > cptr->hdw->cropl_val) {
-		/* Keep checkpatch.pl quiet */
 		*val = cap->bounds.width - cptr->hdw->cropl_val;
 	}
 	return 0;
@@ -482,12 +473,10 @@ static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = 0;
 	if (cap->bounds.height > cptr->hdw->cropt_val) {
-		/* Keep checkpatch.pl quiet */
 		*val = cap->bounds.height - cptr->hdw->cropt_val;
 	}
 	return 0;
@@ -498,7 +487,6 @@ static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->bounds.left;
@@ -510,7 +498,6 @@ static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->bounds.top;
@@ -522,7 +509,6 @@ static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->bounds.width;
@@ -534,7 +520,6 @@ static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->bounds.height;
@@ -546,7 +531,6 @@ static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->defrect.left;
@@ -558,7 +542,6 @@ static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->defrect.top;
@@ -570,7 +553,6 @@ static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->defrect.width;
@@ -582,7 +564,6 @@ static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->defrect.height;
@@ -594,7 +575,6 @@ static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->pixelaspect.numerator;
@@ -606,7 +586,6 @@ static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val)
 	struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
 	int stat = pvr2_hdw_check_cropcap(cptr->hdw);
 	if (stat != 0) {
-		/* Keep checkpatch.pl quiet */
 		return stat;
 	}
 	*val = cap->pixelaspect.denominator;
@@ -3032,12 +3011,10 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)
 static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw)
 {
 	if (!hdw->cropcap_stale) {
-		/* Keep checkpatch.pl quiet */
 		return 0;
 	}
 	pvr2_i2c_core_status_poll(hdw);
 	if (hdw->cropcap_stale) {
-		/* Keep checkpatch.pl quiet */
 		return -EIO;
 	}
 	return 0;
@@ -3051,7 +3028,6 @@ int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp)
 	LOCK_TAKE(hdw->big_lock);
 	stat = pvr2_hdw_check_cropcap(hdw);
 	if (!stat) {
-		/* Keep checkpatch.pl quiet */
 		memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info));
 	}
 	LOCK_GIVE(hdw->big_lock);
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index ae2ee9b59..ab703d6d5 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -255,12 +255,8 @@ static void set_crop(struct pvr2_hdw *hdw)
 
 static int check_crop(struct pvr2_hdw *hdw)
 {
-	/* The "0 +" stupidity is present only to get checkpatch.pl to
-	   shut up.  I _want_ those parantheses present so that the
-	   two lines automatically line up in my editor.  I despise
-	   checkpatch.pl. */
-	return 0 + (hdw->cropl_dirty || hdw->cropt_dirty ||
-		    hdw->cropw_dirty || hdw->croph_dirty);
+	return (hdw->cropl_dirty || hdw->cropt_dirty ||
+		hdw->cropw_dirty || hdw->croph_dirty);
 }
 
 const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop = {
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 6161657af..37946058f 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -1067,8 +1067,6 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
 		hdw->i2c_func[0x18] = i2c_black_hole;
 	} else if (ir_mode[hdw->unit_number] == 1) {
 		if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_24XXX) {
-			/* This comment is present PURELY to get
-			   checkpatch.pl to STFU.  Lovely, eh? */
 			hdw->i2c_func[0x18] = i2c_24xxx_ir;
 		}
 	}
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index b50565d27..16461dd92 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -159,7 +159,6 @@ static ssize_t show_def(struct device *class_dev,
 	pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
 			 cip->chptr, cip->ctl_id, val, ret);
 	if (ret < 0) {
-		/* Keep checkpatch.pl quiet */
 		return ret;
 	}
 	return scnprintf(buf, PAGE_SIZE, "%d\n", val);
-- 
cgit v1.2.3