summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-07-03 00:22:14 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-07-03 00:22:14 +0000
commit78badebc2e534316f98cafe175f2e4f2096e79fa (patch)
treeedf9c6f2fa6eaa067bdc24b5b974eb2d86b47b6c /linux
parentde6f920cf48080cab26327090fedd7e96b1a68ba (diff)
downloadmediapointer-dvb-s2-78badebc2e534316f98cafe175f2e4f2096e79fa.tar.gz
mediapointer-dvb-s2-78badebc2e534316f98cafe175f2e4f2096e79fa.tar.bz2
* Make.config, tuner-core.c, tuner.h:
- Finish previous cleanups
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/tuner-core.c7
-rw-r--r--linux/include/media/tuner.h11
2 files changed, 4 insertions, 14 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 83ebda7c3..3d14c424a 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.44 2005/07/02 16:24:34 mkrufky Exp $
+ * $Id: tuner-core.c,v 1.45 2005/07/03 00:22:14 nsh Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -432,11 +432,6 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
switch (cmd) {
/* --- configuration --- */
- case TUNER_SET_TYPE:
- tuner_dbg("Calling set_type for type=%d\n",*iarg);
-
- set_type(client, *iarg, T_RADIO | T_ANALOG_TV | T_DIGITAL_TV);
- break;
case TUNER_SET_TYPE_ADDR:
tuner_dbg ("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x\n",
((struct tuner_addr *)arg)->type,
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index d16e65fab..210b75510 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
-/* $Id: tuner.h,v 1.39 2005/07/02 15:24:11 nsh Exp $
+/* $Id: tuner.h,v 1.40 2005/07/03 00:22:14 nsh Exp $
*
tuner.h - definition for different tuners
@@ -26,8 +26,6 @@
#include <linux/videodev2.h>
-#include "id.h"
-
#define ADDR_UNSET (255)
#define TUNER_TEMIC_PAL 0 /* 4002 FH5 (3X 7756, 9483) */
@@ -133,11 +131,8 @@
#define TCL 11
#define THOMSON 12
-#define TUNER_SET_TYPE _IOW('t',1,int) /* set tuner type */
-#define TUNER_SET_TVFREQ _IOW('t',2,int) /* set tv freq */
-#define TUNER_SET_TYPE_ADDR _IOW('T',3,int) /* set tuner type and I2C addr */
-
-#define TDA9887_SET_CONFIG _IOW('t',5,int)
+#define TUNER_SET_TYPE_ADDR _IOW('T',3,int)
+#define TDA9887_SET_CONFIG _IOW('t',5,int)
/* tv card specific */
# define TDA9887_PRESENT (1<<0)