From 06809ec7b2a03aa929aaa6423603489337a34b8c Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Wed, 2 Dec 2009 22:11:00 -0300
Subject: [PATCH] --- yaml --- r: 179446 b: refs/heads/master c:
 da7365f46607207c8166167ba497e3cb3e02270d h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/media/dvb/mantis/mantis_core.c   |  2 --
 trunk/drivers/media/dvb/mantis/mantis_pci.c    |  1 -
 trunk/drivers/media/dvb/mantis/mantis_vp2033.c | 14 +-------------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index b530ca77215c..1730874c55bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55172773c57221c7c81e445d04f811f2f0478c3e
+refs/heads/master: da7365f46607207c8166167ba497e3cb3e02270d
diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/drivers/media/dvb/mantis/mantis_core.c
index 1012959499a2..d159ad6fc321 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_core.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_core.c
@@ -48,7 +48,6 @@ static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
 
 		return err;
 	}
-//	msleep_interruptible(2);
 
 	return 0;
 }
@@ -75,7 +74,6 @@ static int write_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
 	return 0;
 }
 
-
 static int get_mac_address(struct mantis_pci *mantis)
 {
 	int err;
diff --git a/trunk/drivers/media/dvb/mantis/mantis_pci.c b/trunk/drivers/media/dvb/mantis/mantis_pci.c
index 0bc25d2778f5..402f866e12d9 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_pci.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_pci.c
@@ -74,7 +74,6 @@ static irqreturn_t mantis_pci_irq(int irq, void *dev_id)
 	}
 	if (stat & MANTIS_INT_I2CRACK) {
 		dprintk(verbose, MANTIS_DEBUG, 0, "* I2C R-ACK *");
-//		wake_up(&mantis->i2c_wq);
 	}
 	if (stat & MANTIS_INT_PCMCIA7) {
 		dprintk(verbose, MANTIS_DEBUG, 0, "* PCMCIA-07 *");
diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp2033.c b/trunk/drivers/media/dvb/mantis/mantis_vp2033.c
index e98959769120..853b558b928e 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -21,17 +21,6 @@
 #include "mantis_common.h"
 #include "mantis_vp2033.h"
 
-struct tda10021_state {
-	struct i2c_adapter *i2c;
-	struct dvb_frontend_ops ops;
-	/* configuration settings */
-	const struct tda10021_config *config;
-	struct dvb_frontend frontend;
-
-	u8 pwm;
-	u8 reg0;
-};
-
 #define MANTIS_MODEL_NAME	"VP-2033"
 #define MANTIS_DEV_TYPE		"DVB-C"
 
@@ -49,7 +38,6 @@ struct cu1216_config philips_cu1216_config = {
 int philips_cu1216_tuner_set(struct dvb_frontend *fe,
 			     struct dvb_frontend_parameters *params)
 {
-//	struct tda10021_state *state = fe->demodulator_priv;
 	struct mantis_pci *mantis = fe->dvb->priv;
 
 	u8 buf[4];
@@ -71,11 +59,11 @@ int philips_cu1216_tuner_set(struct dvb_frontend *fe,
 	buf[3] = (params->frequency < 150000000 ? 0xA1 :
 		  params->frequency < 445000000 ? 0x92 : 0x34);
 
-//	if (i2c_transfer(state->i2c, &msg, 1) < 0) {
 	if (i2c_transfer(&mantis->adapter, &msg, 1) < 0) {
 		printk("%s tuner not ack!\n", __FUNCTION__);
 		return -EIO;
 	}
 	msleep(100);
+
 	return 0;
 }