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

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

diff --git a/kernel/drivers/media/dvb-frontends/m88rs2000.c b/kernel/drivers/media/dvb-frontends/m88rs2000.c
index d63bc9c..9b6f464 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/m88rs2000.c
+++ b/kernel/drivers/media/dvb-frontends/m88rs2000.c
@@ -41,7 +41,7 @@ struct m88rs2000_state {
        u8 no_lock_count;
        u32 tuner_frequency;
        u32 symbol_rate;
-       fe_code_rate_t fec_inner;
+       enum fe_code_rate fec_inner;
        u8 tuner_level;
        int errmode;
 };
@@ -247,7 +247,7 @@ static int m88rs2000_send_diseqc_msg(struct dvb_frontend *fe,
 }
 
 static int m88rs2000_send_diseqc_burst(struct dvb_frontend *fe,
-                                               fe_sec_mini_cmd_t burst)
+                                      enum fe_sec_mini_cmd burst)
 {
        struct m88rs2000_state *state = fe->demodulator_priv;
        u8 reg0, reg1;
@@ -264,7 +264,8 @@ static int m88rs2000_send_diseqc_burst(struct dvb_frontend *fe,
        return 0;
 }
 
-static int m88rs2000_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+static int m88rs2000_set_tone(struct dvb_frontend *fe,
+                             enum fe_sec_tone_mode tone)
 {
        struct m88rs2000_state *state = fe->demodulator_priv;
        u8 reg0, reg1;
@@ -412,7 +413,8 @@ static int m88rs2000_tab_set(struct m88rs2000_state *state,
        return 0;
 }
 
-static int m88rs2000_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
+static int m88rs2000_set_voltage(struct dvb_frontend *fe,
+                                enum fe_sec_voltage volt)
 {
        struct m88rs2000_state *state = fe->demodulator_priv;
        u8 data;
@@ -462,7 +464,8 @@ static int m88rs2000_sleep(struct dvb_frontend *fe)
        return ret;
 }
 
-static int m88rs2000_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int m88rs2000_read_status(struct dvb_frontend *fe,
+                                enum fe_status *status)
 {
        struct m88rs2000_state *state = fe->demodulator_priv;
        u8 reg = m88rs2000_readreg(state, 0x8c);
@@ -539,7 +542,7 @@ static int m88rs2000_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 }
 
 static int m88rs2000_set_fec(struct m88rs2000_state *state,
-               fe_code_rate_t fec)
+                            enum fe_code_rate fec)
 {
        u8 fec_set, reg;
        int ret;
@@ -574,7 +577,7 @@ static int m88rs2000_set_fec(struct m88rs2000_state *state,
        return ret;
 }
 
-static fe_code_rate_t m88rs2000_get_fec(struct m88rs2000_state *state)
+static enum fe_code_rate m88rs2000_get_fec(struct m88rs2000_state *state)
 {
        u8 reg;
        m88rs2000_writereg(state, 0x9a, 0x30);
@@ -606,7 +609,7 @@ static int m88rs2000_set_frontend(struct dvb_frontend *fe)
 {
        struct m88rs2000_state *state = fe->demodulator_priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-       fe_status_t status;
+       enum fe_status status;
        int i, ret = 0;
        u32 tuner_freq;
        s16 offset = 0;