[media] ts2020: call get_rf_strength from frontend

Restore ds3000.c read_signal_strength.
Call tuner get_rf_strength from frontend read_signal_strength.
We are able to do a NULL check and doesn't limit the tuner
attach to the frontend attach area.
At the moment the lmedm04 tuner attach is stuck in frontend
attach area.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 13 insertions, 2 deletions

diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index d128f85844e7..1e344b033277 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -533,6 +533,15 @@ static int ds3000_read_ber(struct dvb_frontend *fe, u32* ber)
         return 0;
 }
 
+static int ds3000_read_signal_strength(struct dvb_frontend *fe,
+                                                u16 *signal_strength)
+{
+        if (fe->ops.tuner_ops.get_rf_strength)
+                fe->ops.tuner_ops.get_rf_strength(fe, signal_strength);
+
+        return 0;
+}
+
 /* calculate DS3000 snr value in dB */
 static int ds3000_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
@@ -1102,6 +1111,7 @@ static struct dvb_frontend_ops ds3000_ops = {
         .i2c_gate_ctrl = ds3000_i2c_gate_ctrl,
         .read_status = ds3000_read_status,
         .read_ber = ds3000_read_ber,
+        .read_signal_strength = ds3000_read_signal_strength,
         .read_snr = ds3000_read_snr,
         .read_ucblocks = ds3000_read_ucblocks,
         .set_voltage = ds3000_set_voltage,
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 283c90fee374..4da5272075cb 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -446,7 +446,9 @@ static int m88rs2000_read_ber(struct dvb_frontend *fe, u32 *ber)
 static int m88rs2000_read_signal_strength(struct dvb_frontend *fe,
         u16 *strength)
 {
-        *strength = 0;
+        if (fe->ops.tuner_ops.get_rf_strength)
+                fe->ops.tuner_ops.get_rf_strength(fe, strength);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index f50e237e1464..ad7ad857ab2a 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -363,7 +363,6 @@ struct dvb_frontend *ts2020_attach(struct dvb_frontend *fe,
 
         memcpy(&fe->ops.tuner_ops, &ts2020_tuner_ops,
                                 sizeof(struct dvb_tuner_ops));
-        fe->ops.read_signal_strength = fe->ops.tuner_ops.get_rf_strength;
 
         return fe;
 }