[media] siano: convert set_fontend to use DVBv5 parameters

Instead of using dvb_frontend_parameters struct, that were
designed for a subset of the supported standards, use the DVBv5
cache information.

Also, fill the supported delivery systems at dvb_frontend_ops
struct.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index df08d6a23a23d8cd27f1de83180a982b33ea0a10..71ee9faabd762d451039b633394e1e496366107d 100644 (file)
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -50,7 +50,7 @@ struct smsdvb_client_t {
        struct completion       tune_done;
 
        /* todo: save freq/band instead whole struct */
-       struct dvb_frontend_parameters fe_params;
+       struct dtv_frontend_properties fe_params;
 
        struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb;
        int event_fe_state;
@@ -591,8 +591,7 @@ static int smsdvb_get_tune_settings(struct dvb_frontend *fe,
        return 0;
 }
 
-static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
-                                   struct dvb_frontend_parameters *p)
+static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe)
 {
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct smsdvb_client_t *client =
@@ -658,8 +657,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
                                           &client->tune_done);
 }
 
-static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe,
-                                    struct dvb_frontend_parameters *p)
+static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe)
 {
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct smsdvb_client_t *client =
@@ -723,8 +721,7 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe,
                                           &client->tune_done);
 }
 
-static int smsdvb_set_frontend(struct dvb_frontend *fe,
-                              struct dvb_frontend_parameters *fep)
+static int smsdvb_set_frontend(struct dvb_frontend *fe)
 {
        struct smsdvb_client_t *client =
                container_of(fe, struct smsdvb_client_t, frontend);
@@ -733,17 +730,17 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
        switch (smscore_get_device_mode(coredev)) {
        case DEVICE_MODE_DVBT:
        case DEVICE_MODE_DVBT_BDA:
-               return smsdvb_dvbt_set_frontend(fe, fep);
+               return smsdvb_dvbt_set_frontend(fe);
        case DEVICE_MODE_ISDBT:
        case DEVICE_MODE_ISDBT_BDA:
-               return smsdvb_isdbt_set_frontend(fe, fep);
+               return smsdvb_isdbt_set_frontend(fe);
        default:
                return -EINVAL;
        }
 }
 
 static int smsdvb_get_frontend(struct dvb_frontend *fe,
-                              struct dvb_frontend_parameters *fep)
+                             struct dtv_frontend_properties *fep)
 {
        struct smsdvb_client_t *client =
                container_of(fe, struct smsdvb_client_t, frontend);
@@ -752,7 +749,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,
 
        /* todo: */
        memcpy(fep, &client->fe_params,
-              sizeof(struct dvb_frontend_parameters));
+              sizeof(struct dtv_frontend_properties));
 
        return 0;
 }
@@ -805,8 +802,8 @@ static struct dvb_frontend_ops smsdvb_fe_ops = {
 
        .release = smsdvb_release,
 
-       .set_frontend_legacy = smsdvb_set_frontend,
-       .get_frontend_legacy = smsdvb_get_frontend,
+       .set_frontend = smsdvb_set_frontend,
+       .get_frontend = smsdvb_get_frontend,
        .get_tune_settings = smsdvb_get_tune_settings,
 
        .read_status = smsdvb_read_status,
@@ -873,6 +870,17 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
        memcpy(&client->frontend.ops, &smsdvb_fe_ops,
               sizeof(struct dvb_frontend_ops));
 
+       switch (smscore_get_device_mode(coredev)) {
+       case DEVICE_MODE_DVBT:
+       case DEVICE_MODE_DVBT_BDA:
+               smsdvb_fe_ops.delsys[0] = SYS_DVBT;
+               break;
+       case DEVICE_MODE_ISDBT:
+       case DEVICE_MODE_ISDBT_BDA:
+               smsdvb_fe_ops.delsys[0] = SYS_ISDBT;
+               break;
+       }
+
        rc = dvb_register_frontend(&client->adapter, &client->frontend);
        if (rc < 0) {
                sms_err("frontend registration failed %d", rc);