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

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

diff --git a/kernel/drivers/media/dvb-frontends/stv0288.c b/kernel/drivers/media/dvb-frontends/stv0288.c
index 632b251..c93d9a4 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/stv0288.c
+++ b/kernel/drivers/media/dvb-frontends/stv0288.c
@@ -44,7 +44,7 @@ struct stv0288_state {
        u8 initialised:1;
        u32 tuner_frequency;
        u32 symbol_rate;
-       fe_code_rate_t fec_inner;
+       enum fe_code_rate fec_inner;
        int errmode;
 };
 
@@ -134,20 +134,20 @@ static int stv0288_set_symbolrate(struct dvb_frontend *fe, u32 srate)
 
        temp = (unsigned int)srate / 1000;
 
-               temp = temp * 32768;
-               temp = temp / 25;
-               temp = temp / 125;
-               b[0] = (unsigned char)((temp >> 12) & 0xff);
-               b[1] = (unsigned char)((temp >> 4) & 0xff);
-               b[2] = (unsigned char)((temp << 4) & 0xf0);
-               stv0288_writeregI(state, 0x28, 0x80); /* SFRH */
-               stv0288_writeregI(state, 0x29, 0); /* SFRM */
-               stv0288_writeregI(state, 0x2a, 0); /* SFRL */
-
-               stv0288_writeregI(state, 0x28, b[0]);
-               stv0288_writeregI(state, 0x29, b[1]);
-               stv0288_writeregI(state, 0x2a, b[2]);
-               dprintk("stv0288: stv0288_set_symbolrate\n");
+       temp = temp * 32768;
+       temp = temp / 25;
+       temp = temp / 125;
+       b[0] = (unsigned char)((temp >> 12) & 0xff);
+       b[1] = (unsigned char)((temp >> 4) & 0xff);
+       b[2] = (unsigned char)((temp << 4) & 0xf0);
+       stv0288_writeregI(state, 0x28, 0x80); /* SFRH */
+       stv0288_writeregI(state, 0x29, 0); /* SFRM */
+       stv0288_writeregI(state, 0x2a, 0); /* SFRL */
+
+       stv0288_writeregI(state, 0x28, b[0]);
+       stv0288_writeregI(state, 0x29, b[1]);
+       stv0288_writeregI(state, 0x2a, b[2]);
+       dprintk("stv0288: stv0288_set_symbolrate\n");
 
        return 0;
 }
@@ -174,7 +174,7 @@ static int stv0288_send_diseqc_msg(struct dvb_frontend *fe,
 }
 
 static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,
-                                               fe_sec_mini_cmd_t burst)
+                                    enum fe_sec_mini_cmd burst)
 {
        struct stv0288_state *state = fe->demodulator_priv;
 
@@ -193,7 +193,7 @@ static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,
        return 0;
 }
 
-static int stv0288_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+static int stv0288_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone)
 {
        struct stv0288_state *state = fe->demodulator_priv;
 
@@ -323,7 +323,8 @@ static u8 stv0288_inittab[] = {
        0xff, 0xff,
 };
 
-static int stv0288_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
+static int stv0288_set_voltage(struct dvb_frontend *fe,
+                              enum fe_sec_voltage volt)
 {
        dprintk("%s: %s\n", __func__,
                volt == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
@@ -361,7 +362,7 @@ static int stv0288_init(struct dvb_frontend *fe)
        return 0;
 }
 
-static int stv0288_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int stv0288_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct stv0288_state *state = fe->demodulator_priv;