diff options
Diffstat (limited to 'drivers/media/dvb/frontends/cxd2820r_priv.h')
| -rw-r--r-- | drivers/media/dvb/frontends/cxd2820r_priv.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/media/dvb/frontends/cxd2820r_priv.h b/drivers/media/dvb/frontends/cxd2820r_priv.h index 95539134efdb..9a9822cad9cd 100644 --- a/drivers/media/dvb/frontends/cxd2820r_priv.h +++ b/drivers/media/dvb/frontends/cxd2820r_priv.h | |||
| @@ -48,12 +48,9 @@ struct reg_val_mask { | |||
| 48 | 48 | ||
| 49 | struct cxd2820r_priv { | 49 | struct cxd2820r_priv { |
| 50 | struct i2c_adapter *i2c; | 50 | struct i2c_adapter *i2c; |
| 51 | struct dvb_frontend fe[2]; | 51 | struct dvb_frontend fe; |
| 52 | struct cxd2820r_config cfg; | 52 | struct cxd2820r_config cfg; |
| 53 | 53 | ||
| 54 | struct mutex fe_lock; /* FE lock */ | ||
| 55 | int active_fe:2; /* FE lock, -1=NONE, 0=DVB-T/T2, 1=DVB-C */ | ||
| 56 | |||
| 57 | bool ber_running; | 54 | bool ber_running; |
| 58 | 55 | ||
| 59 | u8 bank[2]; | 56 | u8 bank[2]; |
| @@ -89,11 +86,9 @@ int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val); | |||
| 89 | 86 | ||
| 90 | /* cxd2820r_c.c */ | 87 | /* cxd2820r_c.c */ |
| 91 | 88 | ||
| 92 | int cxd2820r_get_frontend_c(struct dvb_frontend *fe, | 89 | int cxd2820r_get_frontend_c(struct dvb_frontend *fe); |
| 93 | struct dvb_frontend_parameters *p); | ||
| 94 | 90 | ||
| 95 | int cxd2820r_set_frontend_c(struct dvb_frontend *fe, | 91 | int cxd2820r_set_frontend_c(struct dvb_frontend *fe); |
| 96 | struct dvb_frontend_parameters *params); | ||
| 97 | 92 | ||
| 98 | int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status); | 93 | int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status); |
| 99 | 94 | ||
| @@ -114,11 +109,9 @@ int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe, | |||
| 114 | 109 | ||
| 115 | /* cxd2820r_t.c */ | 110 | /* cxd2820r_t.c */ |
| 116 | 111 | ||
| 117 | int cxd2820r_get_frontend_t(struct dvb_frontend *fe, | 112 | int cxd2820r_get_frontend_t(struct dvb_frontend *fe); |
| 118 | struct dvb_frontend_parameters *p); | ||
| 119 | 113 | ||
| 120 | int cxd2820r_set_frontend_t(struct dvb_frontend *fe, | 114 | int cxd2820r_set_frontend_t(struct dvb_frontend *fe); |
| 121 | struct dvb_frontend_parameters *params); | ||
| 122 | 115 | ||
| 123 | int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status); | 116 | int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status); |
| 124 | 117 | ||
| @@ -139,11 +132,9 @@ int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe, | |||
| 139 | 132 | ||
| 140 | /* cxd2820r_t2.c */ | 133 | /* cxd2820r_t2.c */ |
| 141 | 134 | ||
| 142 | int cxd2820r_get_frontend_t2(struct dvb_frontend *fe, | 135 | int cxd2820r_get_frontend_t2(struct dvb_frontend *fe); |
| 143 | struct dvb_frontend_parameters *p); | ||
| 144 | 136 | ||
| 145 | int cxd2820r_set_frontend_t2(struct dvb_frontend *fe, | 137 | int cxd2820r_set_frontend_t2(struct dvb_frontend *fe); |
| 146 | struct dvb_frontend_parameters *params); | ||
| 147 | 138 | ||
| 148 | int cxd2820r_read_status_t2(struct dvb_frontend *fe, fe_status_t *status); | 139 | int cxd2820r_read_status_t2(struct dvb_frontend *fe, fe_status_t *status); |
| 149 | 140 | ||