Commit da7365f4 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13708): [Mantis] Remove some dead code 



Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 55172773

drivers/media/dvb/mantis/mantis_core.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/dvb/mantis/mantis_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -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 *");

drivers/media/dvb/mantis/mantis_vp2033.c

+1 −13
Original line number Diff line number Diff line
@@ -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;

}