[PATCH] dvb: stv0299: reduce i2c xfer and set register 0x12 from inittab

stv0299_set_frontend(): reduced number of i2c transfers, set register 0x12
from inittab

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6 files changed, 7 insertions, 9 deletions

diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 35dc8439be1b..29c48665e130 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -561,8 +561,6 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
         stv0299_writeregI(state, 0x22, 0x00);
         stv0299_writeregI(state, 0x23, 0x00);
-        stv0299_readreg (state, 0x23);
-        stv0299_writeregI(state, 0x12, 0xb9);
 
         state->tuner_frequency = p->frequency;
         state->fec_inner = p->u.qpsk.fec_inner;
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 820eea294326..87ea52757a21 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1566,7 +1566,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -1668,7 +1668,7 @@ static u8 alps_bsbe1_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index ac108102b67a..aa75dc03a0b3 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -499,7 +499,7 @@ static u8 typhoon_cinergy1200s_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 9263ed686fdc..75fb92d60998 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -490,7 +490,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 8ee4ac5b536b..755df81cbc49 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -305,7 +305,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index ba308349ac9e..4fd8bbc47037 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -286,7 +286,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -383,7 +383,7 @@ static u8 alps_bsbe1_inittab[] = {
         0x0e, 0x23,  /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,  // AGC2 0x3d
         0x11, 0x84,
-        0x12, 0xb5,  // Lock detect: -64 Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,  // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,