These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / dvb-frontends / cx24116.c

diff --git a/kernel/drivers/media/dvb-frontends/cx24116.c b/kernel/drivers/media/dvb-frontends/cx24116.c
index 7bc68b3..8814f36 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/cx24116.c
+++ b/kernel/drivers/media/dvb-frontends/cx24116.c
@@ -160,13 +160,13 @@ enum cmds {
 struct cx24116_tuning {
        u32 frequency;
        u32 symbol_rate;
-       fe_spectral_inversion_t inversion;
-       fe_code_rate_t fec;
+       enum fe_spectral_inversion inversion;
+       enum fe_code_rate fec;
 
-       fe_delivery_system_t delsys;
-       fe_modulation_t modulation;
-       fe_pilot_t pilot;
-       fe_rolloff_t rolloff;
+       enum fe_delivery_system delsys;
+       enum fe_modulation modulation;
+       enum fe_pilot pilot;
+       enum fe_rolloff rolloff;
 
        /* Demod values */
        u8 fec_val;
@@ -285,7 +285,7 @@ static int cx24116_readreg(struct cx24116_state *state, u8 reg)
 }
 
 static int cx24116_set_inversion(struct cx24116_state *state,
-       fe_spectral_inversion_t inversion)
+       enum fe_spectral_inversion inversion)
 {
        dprintk("%s(%d)\n", __func__, inversion);
 
@@ -373,9 +373,9 @@ static int cx24116_set_inversion(struct cx24116_state *state,
  * a scheme are support. Especially, no auto detect when in S2 mode.
  */
 static struct cx24116_modfec {
-       fe_delivery_system_t delivery_system;
-       fe_modulation_t modulation;
-       fe_code_rate_t fec;
+       enum fe_delivery_system delivery_system;
+       enum fe_modulation modulation;
+       enum fe_code_rate fec;
        u8 mask;        /* In DVBS mode this is used to autodetect */
        u8 val;         /* Passed to the firmware to indicate mode selection */
 } CX24116_MODFEC_MODES[] = {
@@ -415,7 +415,7 @@ static struct cx24116_modfec {
 };
 
 static int cx24116_lookup_fecmod(struct cx24116_state *state,
-       fe_delivery_system_t d, fe_modulation_t m, fe_code_rate_t f)
+       enum fe_delivery_system d, enum fe_modulation m, enum fe_code_rate f)
 {
        int i, ret = -EOPNOTSUPP;
 
@@ -434,7 +434,9 @@ static int cx24116_lookup_fecmod(struct cx24116_state *state,
 }
 
 static int cx24116_set_fec(struct cx24116_state *state,
-       fe_delivery_system_t delsys, fe_modulation_t mod, fe_code_rate_t fec)
+                          enum fe_delivery_system delsys,
+                          enum fe_modulation mod,
+                          enum fe_code_rate fec)
 {
        int ret = 0;
 
@@ -683,7 +685,7 @@ static int cx24116_load_firmware(struct dvb_frontend *fe,
        return 0;
 }
 
-static int cx24116_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int cx24116_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct cx24116_state *state = fe->demodulator_priv;
 
@@ -844,7 +846,7 @@ static int cx24116_wait_for_lnb(struct dvb_frontend *fe)
 }
 
 static int cx24116_set_voltage(struct dvb_frontend *fe,
-       fe_sec_voltage_t voltage)
+       enum fe_sec_voltage voltage)
 {
        struct cx24116_cmd cmd;
        int ret;
@@ -872,7 +874,7 @@ static int cx24116_set_voltage(struct dvb_frontend *fe,
 }
 
 static int cx24116_set_tone(struct dvb_frontend *fe,
-       fe_sec_tone_mode_t tone)
+       enum fe_sec_tone_mode tone)
 {
        struct cx24116_cmd cmd;
        int ret;
@@ -1055,7 +1057,7 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend *fe,
 
 /* Send DiSEqC burst */
 static int cx24116_diseqc_send_burst(struct dvb_frontend *fe,
-       fe_sec_mini_cmd_t burst)
+       enum fe_sec_mini_cmd burst)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        int ret;
@@ -1220,7 +1222,7 @@ static int cx24116_set_frontend(struct dvb_frontend *fe)
        struct cx24116_state *state = fe->demodulator_priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct cx24116_cmd cmd;
-       fe_status_t tunerstat;
+       enum fe_status tunerstat;
        int i, status, ret, retune = 1;
 
        dprintk("%s()\n", __func__);
@@ -1441,7 +1443,7 @@ tuned:  /* Set/Reset B/W */
 }
 
 static int cx24116_tune(struct dvb_frontend *fe, bool re_tune,
-       unsigned int mode_flags, unsigned int *delay, fe_status_t *status)
+       unsigned int mode_flags, unsigned int *delay, enum fe_status *status)
 {
        /*
         * It is safe to discard "params" here, as the DVB core will sync