Removed "#define NGENE_LNB" and also use of lnbh24 module.

Removed  stv0900_regs.

2 files changed, 0 insertions, 56 deletions

diff --git a/linux/drivers/media/video/ngene/ngene-core.c b/linux/drivers/media/video/ngene/ngene-core.c
index 881d14abb..c9955f3ee 100644
--- a/linux/drivers/media/video/ngene/ngene-core.c
+++ b/linux/drivers/media/video/ngene/ngene-core.c
@@ -52,7 +52,6 @@
 #include "stv0900_reg.h"
 #include "stv6110.h"
 #endif /* NGENE_STV090X */
-#include "lnbh24.h"
 
 #ifdef NGENE_COMMAND_API
 #include "ngene-ioctls.h"
@@ -3331,7 +3330,6 @@ static struct dvb_device dvbdev_video = {
 /* LNBH21 *******************************************************************/
 /****************************************************************************/
 
-#ifdef NGENE_LNB
 static int lnbh21_set_voltage(struct dvb_frontend *fe,
 			      fe_sec_voltage_t voltage)
 {
@@ -3379,7 +3377,6 @@ static int lnbh21_set_tone(struct dvb_frontend *fe,
 	return i2c_write(&chan->i2c_adapter,
 			 chan->dev->card_info->lnb[chan->number], chan->lnbh);
 }
-#endif
 
 
 /****************************************************************************/
@@ -3623,20 +3620,11 @@ static int tuner_attach_stv6110(struct ngene_channel *chan)
 	}
 #endif /* NGENE_STV090X */
 
-#ifdef NGENE_LNB
 	chan->lnbh=0x40; /* use TTX */
 	chan->fe->sec_priv=chan;
 	chan->set_tone=chan->fe->ops.set_tone;
 	chan->fe->ops.set_tone=lnbh21_set_tone;
 	chan->fe->ops.set_voltage=lnbh21_set_voltage;
-#else
-	printk(DEVICE_NAME ": lnbh24_attach: nr = %d, lnb = %x\n", chan->number, chan->dev->card_info->lnb[chan->number]);
-	if (!dvb_attach(lnbh24_attach, chan->fe, &chan->i2c_adapter, 0, 0,
-			chan->dev->card_info->lnb[chan->number])) {
-		printk(KERN_ERR	"No LNBH24 found!\n");
-		return -ENODEV;
-	}
-#endif /* NGENE_LNB */
 
 	return 0;
 }
@@ -4191,49 +4179,6 @@ static struct stv6110x_config tuner_mps2_1 = {
 };
 
 #else
-#if 0
-static struct stv0900_reg stv0900_regs[] = {
-//	{ R0900_TSGENERAL,         0x00 },
-//GPIO:
-//	{ R0900_CLKI2CFG,          0x5a }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value=45 (CLKOUT3)
-//	{ R0900_ERROR1CFG,         0xc4 }, /* v4l: n.d. */ // GPIO: open-drain=1, xor=0, value=22 (ERROR1)
-//	{ R0900_CLKOUT27CFG,       0x7e }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value=63 (XTAL_IN)
-//	{ R0900_CLKOUT1CFG,        0xc6 }, /* v4l: 0x50 */ // GPIO: open-drain=1, xor=0, value=35 (CLKOUT1)
-//	{ R0900_CLKOUT2CFG,        0xd0 }, /* v4l: 0x50 */ // GPIO: open-drain=1, xor=0, value=40 (CLKOUT2)
-//	{ R0900_DATA71CFG,         0xc8 }, /* v4l: 0x52 */ // GPIO: open-drain=1, xor=0, value=36 (D71)
-//	{ R0900_DISEQCO1CFG,       0x14 }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value=10 (DISEQCOUT1)
-//	{ R0900_DISEQCO2CFG,       0x16 }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value=11 (DISEQCOUT2)
-//	{ R0900_GPIO9CFG,          0x00 }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value= 0 (logical 0)
-//	{ R0900_GPIO10CFG,         0x02 }, /* v4l: n.d. */ // GPIO: open-drain=0, xor=0, value= 1 (logical 1)
-//	{ R0900_DPN1CFG,           0xc0 }, /* v4l: 0x4a */ // GPIO: open-drain=1, xor=0, value=32 (DPN1)
-//	{ R0900_STROUT1CFG,        0xc2 }, /* v4l: 0x4c */ // GPIO: open-drain=1, xor=0, value=33 (STROUT1)
-//	{ R0900_STROUT2CFG,        0xcc }, /* v4l: 0x4c */ // GPIO: open-drain=1, xor=0, value=38 (STROUT2)
-//
-//	{ R0900_P1_LDT2,           0xb0 }, /* v4l: 0xb8 */ // Negative edge of carrier lock detector (n=2:1)
-//	{ R0900_P2_LDT2,           0xb0 }, /* v4l: 0xb8 */ // Negative edge of carrier lock detector (n=2:1)
-//	{ R0900_P1_TMGCFG,         0xd3 }, /* v4l: 0xd2 */ // Timing lock detector
-//	{ R0900_P2_TMGCFG,         0xd3 }, /* v4l: 0xd2 */ // Timing lock detector
-//TNRCFG
-//	{ R0900_P1_TNRCFG2,        0x80 }, /* v4l: 0x82 */
-//	{ R0900_P2_TNRCFG2,        0x80 }, /* v4l: 0x02 */
-//TSCFG
-	{ R0900_P1_TSCFGH,         0x60 }, /* v4l: 0xe0 */
-	{ R0900_P2_TSCFGH,         0x60 }, /* v4l: 0xe0 */
-	{ R0900_P1_TSCFGM,         0x00 }, /* v4l: 0xc0 */
-	{ R0900_P2_TSCFGM,         0x00 }, /* v4l: 0xc0 */
-	{ R0900_P1_TSCFGL,         0x20 }, /* v4l: 0x20 */
-	{ R0900_P2_TSCFGL,         0x20 }, /* v4l: 0x20 */
-
-//	{ R0900_P1_BCLC2S2Q,       0x86 }, /* v4l: 0x86 */
-//	{ R0900_P2_BCLC2S2Q,       0xa5 }, /* v4l: 0x86 */
-//	{ R0900_P1_BCLC2S28,       0x86 }, /* v4l: 0x86 */
-//	{ R0900_P2_BCLC2S28,       0xa5 }, /* v4l: 0x86 */
-//	{ R0900_P1_SFRUPRATIO,     0x40 }, /* v4l: 0xf0 */
-//	{ R0900_P2_SFRUPRATIO,     0x40 }, /* v4l: 0xf0 */
-
-	{ 0xffff,                  0xff }, /* terminate */
-};
-#endif
 
 static struct stv0900_config fe_mps2 = {
 	.demod_address  = 0x68,
diff --git a/linux/drivers/media/video/ngene/ngene.h b/linux/drivers/media/video/ngene/ngene.h
index 5a7582e32..7f0637fdf 100644
--- a/linux/drivers/media/video/ngene/ngene.h
+++ b/linux/drivers/media/video/ngene/ngene.h
@@ -27,7 +27,6 @@
 //#define ONE_ADAPTER
 #define NGENE_COMMAND_API
 #define NGENE_STV090X
-#define NGENE_LNB
 //#define NGENE_V4L
 
 #include <linux/types.h>