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

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

diff --git a/kernel/drivers/media/dvb-frontends/tda10086.c b/kernel/drivers/media/dvb-frontends/tda10086.c
index fcfe2e0..95a33e1 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/tda10086.c
+++ b/kernel/drivers/media/dvb-frontends/tda10086.c
@@ -185,7 +185,8 @@ static void tda10086_diseqc_wait(struct tda10086_state *state)
        }
 }
 
-static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int tda10086_set_tone(struct dvb_frontend *fe,
+                            enum fe_sec_tone_mode tone)
 {
        struct tda10086_state* state = fe->demodulator_priv;
        u8 t22k_off = 0x80;
@@ -238,7 +239,8 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
        return 0;
 }
 
-static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
+static int tda10086_send_burst(struct dvb_frontend *fe,
+                              enum fe_sec_mini_cmd minicmd)
 {
        struct tda10086_state* state = fe->demodulator_priv;
        u8 oldval = tda10086_read_byte(state, 0x36);
@@ -472,8 +474,8 @@ static int tda10086_get_frontend(struct dvb_frontend *fe)
                return -EINVAL;
 
        /* calculate the updated frequency (note: we convert from Hz->kHz) */
-       tmp64 = tda10086_read_byte(state, 0x52);
-       tmp64 |= (tda10086_read_byte(state, 0x51) << 8);
+       tmp64 = ((u64)tda10086_read_byte(state, 0x52)
+               | (tda10086_read_byte(state, 0x51) << 8));
        if (tmp64 & 0x8000)
                tmp64 |= 0xffffffffffff0000ULL;
        tmp64 = (tmp64 * (SACLK/1000ULL));
@@ -551,7 +553,8 @@ static int tda10086_get_frontend(struct dvb_frontend *fe)
        return 0;
 }
 
-static int tda10086_read_status(struct dvb_frontend* fe, fe_status_t *fe_status)
+static int tda10086_read_status(struct dvb_frontend *fe,
+                               enum fe_status *fe_status)
 {
        struct tda10086_state* state = fe->demodulator_priv;
        u8 val;