ivtv: remove userspace tuner dependent code

From: Hans Verkuil <hverkuil@xs4all.nl>

By request of mchehab I've removed the userspace tuner dependent code.
Use my v4l-dvb-xc tree in the meantime for the userspace tuner support.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

5 files changed, 5 insertions, 26 deletions

diff --git a/linux/drivers/media/video/ivtv/ivtv-cards.c b/linux/drivers/media/video/ivtv/ivtv-cards.c
index caa82b296..26c1cb3fd 100644
--- a/linux/drivers/media/video/ivtv/ivtv-cards.c
+++ b/linux/drivers/media/video/ivtv/ivtv-cards.c
@@ -839,7 +839,7 @@ static const struct ivtv_card ivtv_card_pg600v2 = {
 	.hw_audio = IVTV_HW_CX25840,
 	.hw_audio_ctrl = IVTV_HW_CX25840,
 	.hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER,
-#ifdef CONFIG_XC3028
+#ifdef HAVE_XC2028
 	.video_inputs = {
 		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },
 		{ IVTV_CARD_INPUT_SVIDEO1,    1,
@@ -885,7 +885,7 @@ static const struct ivtv_card ivtv_card_club3d = {
 	.hw_audio = IVTV_HW_CX25840,
 	.hw_audio_ctrl = IVTV_HW_CX25840,
 	.hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER,
-#ifdef CONFIG_XC3028
+#ifdef HAVE_XC2028
 	.video_inputs = {
 		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },
 		{ IVTV_CARD_INPUT_SVIDEO1,    1,
@@ -931,7 +931,7 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = {
 	.hw_audio = IVTV_HW_CX25840,
 	.hw_audio_ctrl = IVTV_HW_CX25840,
 	.hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER | IVTV_HW_WM8739,
-#ifdef CONFIG_XC3028
+#ifdef HAVE_XC2028
 	.video_inputs = {
 		{ IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },
 		{ IVTV_CARD_INPUT_SVIDEO1,    1, CX25840_SVIDEO3    },
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c
index ac0e3dee3..621d830e9 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.c
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.c
@@ -59,9 +59,6 @@
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
 #include <media/v4l2-chip-ident.h>
-#ifdef CONFIG_XC3028
-#include "tuner/tuner-stub.h"
-#endif
 
 /* var to keep track of the number of array elements in use */
 int ivtv_cards_active = 0;
@@ -829,18 +826,8 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
 #ifndef CONFIG_VIDEO_TUNER
 	if (hw & IVTV_HW_TUNER) {
 		if (itv->options.tuner == TUNER_XCEIVE_XC3028) {
-#ifdef CONFIG_XC3028
-			struct tuner_config config;
-
-			memset(&config, 0, sizeof(config));
-			config.tunerid = 1;
-			config.clientid = -1;
-			itv->tunerid = tuner_register_client(&itv->i2c_adap,
-				ivtv_reset_tuner_gpio, itv, &config);
-#else
 			IVTV_INFO("Xceive tuner not yet supported, only composite and S-Video inputs will be available\n");
 			itv->tunerid = 1;
-#endif
 		}
 		else {
 			ivtv_request_module(itv, "tuner");
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 9ace37cc4..0dcf23c32 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -69,7 +69,7 @@
 #include <media/ivtv.h>
 
 #if 0
-#define CONFIG_XC3028 1
+#define HAVE_XC2028 1
 #endif
 
 #define IVTV_ENCODER_OFFSET	0x00000000
diff --git a/linux/drivers/media/video/ivtv/ivtv-gpio.c b/linux/drivers/media/video/ivtv/ivtv-gpio.c
index 09b43b41f..14f57285d 100644
--- a/linux/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/linux/drivers/media/video/ivtv/ivtv-gpio.c
@@ -122,7 +122,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
 	write_reg(curdir, IVTV_REG_GPIO_DIR);
 }
 
-#ifdef CONFIG_XC3028
+#ifdef HAVE_XC2028
 /* Xceive tuner reset function */
 int ivtv_reset_tuner_gpio(void *dev, int cmd, int value)
 {
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c
index 1e4c9b0f6..624650520 100644
--- a/linux/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c
@@ -65,9 +65,6 @@
 #include "ivtv-i2c.h"
 
 #include <media/ir-kbd-i2c.h>
-#ifdef CONFIG_XC3028
-#include "tuner/tuner-stub.h"
-#endif
 
 /* i2c implementation for cx23415/6 chip, ivtv project.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
@@ -708,11 +705,6 @@ void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg)
 		return;
 	}
 	i2c_clients_command(&itv->i2c_adap, cmd, arg);
-	if (itv->tunerid) {
-#ifdef CONFIG_XC3028
-		tuner_v4l_cmd(itv->tunerid, cmd, arg);
-#endif
-	}
 	if (itv->hw_flags & IVTV_HW_GPIO)
 		ivtv_gpio(itv, cmd, arg);
 }