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

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

diff --git a/kernel/drivers/media/dvb-frontends/s5h1420.c b/kernel/drivers/media/dvb-frontends/s5h1420.c
index 0b4f8fe..9c22a4c 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/s5h1420.c
+++ b/kernel/drivers/media/dvb-frontends/s5h1420.c
@@ -52,7 +52,7 @@ struct s5h1420_state {
        u8 postlocked:1;
        u32 fclk;
        u32 tunedfreq;
-       fe_code_rate_t fec_inner;
+       enum fe_code_rate fec_inner;
        u32 symbol_rate;
 
        /* FIXME: ugly workaround for flexcop's incapable i2c-controller
@@ -124,7 +124,8 @@ static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data)
        return 0;
 }
 
-static int s5h1420_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+static int s5h1420_set_voltage(struct dvb_frontend *fe,
+                              enum fe_sec_voltage voltage)
 {
        struct s5h1420_state* state = fe->demodulator_priv;
 
@@ -149,7 +150,8 @@ static int s5h1420_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
        return 0;
 }
 
-static int s5h1420_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int s5h1420_set_tone(struct dvb_frontend *fe,
+                           enum fe_sec_tone_mode tone)
 {
        struct s5h1420_state* state = fe->demodulator_priv;
 
@@ -270,7 +272,8 @@ exit:
        return result;
 }
 
-static int s5h1420_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
+static int s5h1420_send_burst(struct dvb_frontend *fe,
+                             enum fe_sec_mini_cmd minicmd)
 {
        struct s5h1420_state* state = fe->demodulator_priv;
        u8 val;
@@ -307,10 +310,10 @@ static int s5h1420_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minicm
        return result;
 }
 
-static fe_status_t s5h1420_get_status_bits(struct s5h1420_state* state)
+static enum fe_status s5h1420_get_status_bits(struct s5h1420_state *state)
 {
        u8 val;
-       fe_status_t status = 0;
+       enum fe_status status = 0;
 
        val = s5h1420_readreg(state, 0x14);
        if (val & 0x02)
@@ -328,7 +331,8 @@ static fe_status_t s5h1420_get_status_bits(struct s5h1420_state* state)
        return status;
 }
 
-static int s5h1420_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int s5h1420_read_status(struct dvb_frontend *fe,
+                              enum fe_status *status)
 {
        struct s5h1420_state* state = fe->demodulator_priv;
        u8 val;
@@ -561,27 +565,33 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,
        } else {
                switch (p->fec_inner) {
                case FEC_1_2:
-                       vit08 = 0x01; vit09 = 0x10;
+                       vit08 = 0x01;
+                       vit09 = 0x10;
                        break;
 
                case FEC_2_3:
-                       vit08 = 0x02; vit09 = 0x11;
+                       vit08 = 0x02;
+                       vit09 = 0x11;
                        break;
 
                case FEC_3_4:
-                       vit08 = 0x04; vit09 = 0x12;
+                       vit08 = 0x04;
+                       vit09 = 0x12;
                        break;
 
                case FEC_5_6:
-                       vit08 = 0x08; vit09 = 0x13;
+                       vit08 = 0x08;
+                       vit09 = 0x13;
                        break;
 
                case FEC_6_7:
-                       vit08 = 0x10; vit09 = 0x14;
+                       vit08 = 0x10;
+                       vit09 = 0x14;
                        break;
 
                case FEC_7_8:
-                       vit08 = 0x20; vit09 = 0x15;
+                       vit08 = 0x20;
+                       vit09 = 0x15;
                        break;
 
                default:
@@ -595,7 +605,7 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,
        dprintk("leave %s\n", __func__);
 }
 
-static fe_code_rate_t s5h1420_getfec(struct s5h1420_state* state)
+static enum fe_code_rate s5h1420_getfec(struct s5h1420_state *state)
 {
        switch(s5h1420_readreg(state, 0x32) & 0x07) {
        case 0:
@@ -620,7 +630,8 @@ static fe_code_rate_t s5h1420_getfec(struct s5h1420_state* state)
        return FEC_NONE;
 }
 
-static fe_spectral_inversion_t s5h1420_getinversion(struct s5h1420_state* state)
+static enum fe_spectral_inversion
+s5h1420_getinversion(struct s5h1420_state *state)
 {
        if (s5h1420_readreg(state, 0x32) & 0x08)
                return INVERSION_ON;