upstream: [media] rtl2832: remove unused if_dvbt config parameter

All used tuners has get_if_frequency() callback and that parameter
is not needed and will not needed as all upcoming tuner drivers
should implement get_if_frequency().

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 1f1bc89..fdbed35 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -511,12 +511,6 @@ static int rtl2832_init(struct dvb_frontend *fe)
                        goto err;
        }
 
-       if (!fe->ops.tuner_ops.get_if_frequency) {
-               ret = rtl2832_set_if(fe, priv->cfg.if_dvbt);
-               if (ret)
-                       goto err;
-       }
-
        /*
         * r820t NIM code does a software reset here at the demod -
         * may not be needed, as there's already a software reset at

diff --git a/drivers/media/dvb-frontends/rtl2832.h b/drivers/media/dvb-frontends/rtl2832.h
index 7845b47..cb3b6b0 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2832.h
+++ b/drivers/media/dvb-frontends/rtl2832.h
@@ -38,13 +38,6 @@ struct rtl2832_config {
        u32 xtal;
 
        /*
-        * IFs for all used modes.
-        * Hz
-        * 4570000, 4571429, 36000000, 36125000, 36166667, 44000000
-        */
-       u32 if_dvbt;
-
-       /*
         * tuner
         * XXX: This must be keep sync with dvb_usb_rtl28xxu demod driver.
         */

diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index 58eb78d..11fa9f2 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -589,14 +589,12 @@ err:
 static const struct rtl2832_config rtl28xxu_rtl2832_fc0012_config = {
        .i2c_addr = 0x10, /* 0x20 */
        .xtal = 28800000,
-       .if_dvbt = 0,
        .tuner = TUNER_RTL2832_FC0012
 };
 
 static const struct rtl2832_config rtl28xxu_rtl2832_fc0013_config = {
        .i2c_addr = 0x10, /* 0x20 */
        .xtal = 28800000,
-       .if_dvbt = 0,
        .tuner = TUNER_RTL2832_FC0013
 };