V4L/DVB (5633): Tuv1236d: move rf input switching code into dvb-pll

This patch removes duplicate code from cx88-dvb and saa7134-dvb that handles
rf input switching for the TUV1236d tuner.

The functionality is added to dvb-pll, where all the other code that 
handles the TUV1236d is kept.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 15 deletions

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index b809f83d9563..b96f8e846fd3 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -546,11 +546,6 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
                 nxt200x_writebytes(state, 0x17, buf, 1);
         }
 
-        /* get tuning information */
-        if (fe->ops.tuner_ops.calc_regs) {
-                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
-        }
-
         /* set additional params */
         switch (p->u.vsb.modulation) {
                 case QAM_64:
@@ -559,27 +554,24 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
                         /* This is just a guess since I am unable to test it */
                         if (state->config->set_ts_params)
                                 state->config->set_ts_params(fe, 1);
-
-                        /* set input */
-                        if (state->config->set_pll_input)
-                                state->config->set_pll_input(buf+1, 1);
                         break;
                 case VSB_8:
                         /* Set non-punctured clock for VSB */
                         if (state->config->set_ts_params)
                                 state->config->set_ts_params(fe, 0);
-
-                        /* set input */
-                        if (state->config->set_pll_input)
-                                state->config->set_pll_input(buf+1, 0);
                         break;
                 default:
                         return -EINVAL;
                         break;
         }
 
-        /* write frequency information */
-        nxt200x_writetuner(state, buf);
+        if (fe->ops.tuner_ops.calc_regs) {
+                /* get tuning information */
+                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
+
+                /* write frequency information */
+                nxt200x_writetuner(state, buf);
+        }
 
         /* reset the agc now that tuning has been completed */
         nxt200x_agc_reset(state);