---

yaml
---
r: 366700
b: refs/heads/master
c: d423e10
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4a2c40f87327c5859edc20a5b6b2afa6071d49
+refs/heads/master: d423e108c1d6ced41964fafc97c02e4b5d0597a1

trunk/drivers/media/dvb-frontends/af9033.c

@@ -285,12 +285,6 @@ static int af9033_init(struct dvb_frontend *fe)
 			goto err;
 	}
 
-	/*
-	 * FIXME: These inits are logically property of demodulator driver
-	 * (that driver), but currently in case of IT9135 those are done by
-	 * tuner driver.
-	 */
-
 	/* load OFSM settings */
 	dev_dbg(&state->i2c->dev, "%s: load ofsm settings\n", __func__);
 	switch (state->cfg.tuner) {

trunk/drivers/media/tuners/it913x.c

@@ -141,40 +141,10 @@ static int it913x_init(struct dvb_frontend *fe)
 {
 	struct it913x_state *state = fe->tuner_priv;
 	int ret, i, reg;
-	struct it913xset *set_lna;
 	u8 val, nv_val;
 	u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
 	u8 b[2];
 
-	/* LNA Scripts */
-	switch (state->tuner_type) {
-	case AF9033_TUNER_IT9135_51:
-		set_lna = it9135_51;
-		break;
-	case AF9033_TUNER_IT9135_52:
-		set_lna = it9135_52;
-		break;
-	case AF9033_TUNER_IT9135_60:
-		set_lna = it9135_60;
-		break;
-	case AF9033_TUNER_IT9135_61:
-		set_lna = it9135_61;
-		break;
-	case AF9033_TUNER_IT9135_62:
-		set_lna = it9135_62;
-		break;
-	case AF9033_TUNER_IT9135_38:
-	default:
-		set_lna = it9135_38;
-	}
-
-	dev_dbg(&state->i2c_adap->dev, "%s: Tuner LNA type :%02x\n",
-			KBUILD_MODNAME, state->tuner_type);
-
-	ret = it913x_script_loader(state, set_lna);
-	if (ret < 0)
-		return ret;
-
 	if (state->chip_ver == 2) {
 		ret = it913x_wr_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1);
 		if (ret < 0)