1 files changed, 8 insertions, 27 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c
index 8748a61be73d..6fe9793b98b3 100644
--- a/drivers/media/dvb/firewire/firedtv-fe.c
+++ b/drivers/media/dvb/firewire/firedtv-fe.c
@@ -141,28 +141,12 @@ static int fdtv_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ucblocks)
         return -EOPNOTSUPP;
 }
 
-static int fdtv_set_frontend(struct dvb_frontend *fe,
-                             struct dvb_frontend_parameters *params)
+static int fdtv_set_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct firedtv *fdtv = fe->sec_priv;
 
-        return avc_tuner_dsd(fdtv, params);
-}
-
-static int fdtv_get_frontend(struct dvb_frontend *fe,
-                             struct dvb_frontend_parameters *params)
-{
-        return -EOPNOTSUPP;
-}
-
-static int fdtv_get_property(struct dvb_frontend *fe, struct dtv_property *tvp)
-{
-        return 0;
-}
-
-static int fdtv_set_property(struct dvb_frontend *fe, struct dtv_property *tvp)
-{
-        return 0;
+        return avc_tuner_dsd(fdtv, p);
 }
 
 void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
@@ -174,10 +158,6 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
         ops->sleep                      = fdtv_sleep;
 
         ops->set_frontend               = fdtv_set_frontend;
-        ops->get_frontend               = fdtv_get_frontend;
-
-        ops->get_property               = fdtv_get_property;
-        ops->set_property               = fdtv_set_property;
 
         ops->read_status                = fdtv_read_status;
         ops->read_ber                   = fdtv_read_ber;
@@ -192,7 +172,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
 
         switch (fdtv->type) {
         case FIREDTV_DVB_S:
-                fi->type                = FE_QPSK;
+                ops->delsys[0]          = SYS_DVBS;
 
                 fi->frequency_min       = 950000;
                 fi->frequency_max       = 2150000;
@@ -211,7 +191,8 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                 break;
 
         case FIREDTV_DVB_S2:
-                fi->type                = FE_QPSK;
+                ops->delsys[0]          = SYS_DVBS;
+                ops->delsys[1]          = SYS_DVBS2;
 
                 fi->frequency_min       = 950000;
                 fi->frequency_max       = 2150000;
@@ -231,7 +212,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                 break;
 
         case FIREDTV_DVB_C:
-                fi->type                = FE_QAM;
+                ops->delsys[0]          = SYS_DVBC_ANNEX_A;
 
                 fi->frequency_min       = 47000000;
                 fi->frequency_max       = 866000000;
@@ -249,7 +230,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                 break;
 
         case FIREDTV_DVB_T:
-                fi->type                = FE_OFDM;
+                ops->delsys[0]          = SYS_DVBT;
 
                 fi->frequency_min       = 49000000;
                 fi->frequency_max       = 861000000;