merge: http://www.kernellabs.com/hg/~pboettcher/v4l-dvb/

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 files changed, 12 insertions, 27 deletions

diff --git a/linux/drivers/staging/go7007/go7007-fw.c b/linux/drivers/staging/go7007/go7007-fw.c
index 871ed43e4..73d867024 100644
--- a/linux/drivers/staging/go7007/go7007-fw.c
+++ b/linux/drivers/staging/go7007/go7007-fw.c
@@ -1034,7 +1034,8 @@ static int brctrl_to_package(struct go7007 *go,
 		0xBF1B,		framelen[7],
 		0,		0,
 
-#if 0 /* Remove once we don't care about matching */
+#if 0 /* keep */
+		/* Remove once we don't care about matching */
 		0x200e,		0x0000,
 		0xBF56,		4,
 		0xBF57,		0,
diff --git a/linux/drivers/staging/go7007/go7007-v4l2.c b/linux/drivers/staging/go7007/go7007-v4l2.c
index 1098cffb6..c929204db 100644
--- a/linux/drivers/staging/go7007/go7007-v4l2.c
+++ b/linux/drivers/staging/go7007/go7007-v4l2.c
@@ -327,7 +327,7 @@ static int set_capture_size(struct go7007 *go, struct v4l2_format *fmt, int try)
 	return 0;
 }
 
-#if 0
+#if 0 /* keep */
 static int clip_to_modet_map(struct go7007 *go, int region,
 		struct v4l2_clip *clip_list)
 {
@@ -610,7 +610,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
 	strlcpy(cap->driver, "go7007", sizeof(cap->driver));
 	strlcpy(cap->card, go->name, sizeof(cap->card));
-#if 0
+#if 0 /* keep */
 	strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info));
 #endif
 
@@ -1178,7 +1178,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std)
 	return 0;
 }
 
-#if 0
+#if 0 /* keep */
 	case VIDIOC_QUERYSTD:
 	{
 		v4l2_std_id *std = arg;
@@ -1457,7 +1457,7 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
 	and vidioc_s_ext_ctrls()
  */
 
-#if 0
+#if 0 /* keep */
 	/* Temporary ioctls for controlling compression characteristics */
 	case GO7007IOC_S_BITRATE:
 	{
diff --git a/linux/drivers/staging/go7007/wis-sony-tuner.c b/linux/drivers/staging/go7007/wis-sony-tuner.c
index 086896cec..cfc1ec64e 100644
--- a/linux/drivers/staging/go7007/wis-sony-tuner.c
+++ b/linux/drivers/staging/go7007/wis-sony-tuner.c
@@ -386,7 +386,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	struct wis_sony_tuner *t = i2c_get_clientdata(client);
 
 	switch (cmd) {
-#if 0
+#if 0 /* keep */
 #ifdef TUNER_SET_TYPE_ADDR
 	case TUNER_SET_TYPE_ADDR:
 	{
diff --git a/linux/drivers/staging/go7007/wis-tw9903.c b/linux/drivers/staging/go7007/wis-tw9903.c
index 6c3427bb6..1360dd1bd 100644
--- a/linux/drivers/staging/go7007/wis-tw9903.c
+++ b/linux/drivers/staging/go7007/wis-tw9903.c
@@ -111,7 +111,8 @@ static int wis_tw9903_command(struct i2c_client *client,
 		i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input << 1));
 		break;
 	}
-#if 0   /* The scaler on this thing seems to be horribly broken */
+#if 0 /* keep */
+	/* The scaler on this thing seems to be horribly broken */
 	case DECODER_SET_RESOLUTION:
 	{
 		struct video_decoder_resolution *res = arg;
@@ -169,7 +170,7 @@ static int wis_tw9903_command(struct i2c_client *client,
 			ctrl->default_value = 0x60;
 			ctrl->flags = 0;
 			break;
-#if 0
+#if 0 /* keep */
 		/* I don't understand how the Chroma Gain registers work... */
 		case V4L2_CID_SATURATION:
 			ctrl->type = V4L2_CTRL_TYPE_INTEGER;
@@ -216,7 +217,7 @@ static int wis_tw9903_command(struct i2c_client *client,
 				dec->contrast = ctrl->value;
 			write_reg(client, 0x11, dec->contrast);
 			break;
-#if 0
+#if 0 /* keep */
 		case V4L2_CID_SATURATION:
 			if (ctrl->value > 127)
 				dec->saturation = 127;
@@ -250,7 +251,7 @@ static int wis_tw9903_command(struct i2c_client *client,
 		case V4L2_CID_CONTRAST:
 			ctrl->value = dec->contrast;
 			break;
-#if 0
+#if 0 /* keep */
 		case V4L2_CID_SATURATION:
 			ctrl->value = dec->saturation;
 			break;
diff --git a/linux/drivers/staging/tm6000/tm6000-i2c.c b/linux/drivers/staging/tm6000/tm6000-i2c.c
index 1af03c38f..818c553b6 100644
--- a/linux/drivers/staging/tm6000/tm6000-i2c.c
+++ b/linux/drivers/staging/tm6000/tm6000-i2c.c
@@ -184,18 +184,6 @@ static u32 functionality(struct i2c_adapter *adap)
 	return I2C_FUNC_SMBUS_EMUL;
 }
 
-#ifndef I2C_PEC
-static void inc_use(struct i2c_adapter *adap)
-{
-	MOD_INC_USE_COUNT;
-}
-
-static void dec_use(struct i2c_adapter *adap)
-{
-	MOD_DEC_USE_COUNT;
-}
-#endif
-
 #define mass_write(addr, reg, data...)					\
 	{ const static u8 _val[] = data;				\
 	rc=tm6000_read_write_usb(dev,USB_DIR_OUT | USB_TYPE_VENDOR,	\
@@ -214,12 +202,7 @@ static struct i2c_algorithm tm6000_algo = {
 };
 
 static struct i2c_adapter tm6000_adap_template = {
-#ifdef I2C_PEC
 	.owner = THIS_MODULE,
-#else
-	.inc_use = inc_use,
-	.dec_use = dec_use,
-#endif
 #ifdef I2C_CLASS_TV_ANALOG
 	.class = I2C_CLASS_TV_ANALOG,
 #endif