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

[kvmfornfv.git] / kernel / drivers / media / pci / ttpci / av7110.c

diff --git a/kernel/drivers/media/pci/ttpci/av7110.c b/kernel/drivers/media/pci/ttpci/av7110.c
index 45199a1..f893649 100644 (file)
--- a/kernel/drivers/media/pci/ttpci/av7110.c
+++ b/kernel/drivers/media/pci/ttpci/av7110.c
@@ -303,7 +303,6 @@ static int arm_thread(void *data)
 static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len,
                                u8 *buffer2, size_t buffer2_len,
                                struct dvb_demux_filter *dvbdmxfilter,
-                               enum dmx_success success,
                                struct av7110 *av7110)
 {
        if (!dvbdmxfilter->feed->demux->dmx.frontend)
@@ -329,16 +328,14 @@ static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len,
                }
                return dvbdmxfilter->feed->cb.sec(buffer1, buffer1_len,
                                                  buffer2, buffer2_len,
-                                                 &dvbdmxfilter->filter,
-                                                 DMX_OK);
+                                                 &dvbdmxfilter->filter);
        case DMX_TYPE_TS:
                if (!(dvbdmxfilter->feed->ts_type & TS_PACKET))
                        return 0;
                if (dvbdmxfilter->feed->ts_type & TS_PAYLOAD_ONLY)
                        return dvbdmxfilter->feed->cb.ts(buffer1, buffer1_len,
                                                         buffer2, buffer2_len,
-                                                        &dvbdmxfilter->feed->feed.ts,
-                                                        DMX_OK);
+                                                        &dvbdmxfilter->feed->feed.ts);
                else
                        av7110_p2t_write(buffer1, buffer1_len,
                                         dvbdmxfilter->feed->pid,
@@ -422,7 +419,7 @@ static void debiirq(unsigned long cookie)
                        DvbDmxFilterCallback((u8 *)av7110->debi_virt,
                                             av7110->debilen, NULL, 0,
                                             av7110->handle2filter[handle],
-                                            DMX_OK, av7110);
+                                            av7110);
                xfer = RX_BUFF;
                break;
 
@@ -1172,7 +1169,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
  ******************************************************************************/
 
 
-static int av7110_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int av7110_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone)
 {
        struct av7110* av7110 = fe->dvb->priv;
 
@@ -1197,7 +1194,7 @@ static int av7110_diseqc_send_master_cmd(struct dvb_frontend* fe,
 }
 
 static int av7110_diseqc_send_burst(struct dvb_frontend* fe,
-                                   fe_sec_mini_cmd_t minicmd)
+                                   enum fe_sec_mini_cmd minicmd)
 {
        struct av7110* av7110 = fe->dvb->priv;
 
@@ -1946,7 +1943,7 @@ static struct l64781_config grundig_29504_401_config = {
 
 
 
-static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
+static int av7110_fe_lock_fix(struct av7110 *av7110, enum fe_status status)
 {
        int ret = 0;
        int synced = (status & FE_HAS_LOCK) ? 1 : 0;
@@ -2008,7 +2005,8 @@ static int av7110_fe_init(struct dvb_frontend* fe)
        return ret;
 }
 
-static int av7110_fe_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int av7110_fe_read_status(struct dvb_frontend *fe,
+                                enum fe_status *status)
 {
        struct av7110* av7110 = fe->dvb->priv;
 
@@ -2043,7 +2041,8 @@ static int av7110_fe_diseqc_send_master_cmd(struct dvb_frontend* fe,
        return ret;
 }
 
-static int av7110_fe_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
+static int av7110_fe_diseqc_send_burst(struct dvb_frontend *fe,
+                                      enum fe_sec_mini_cmd minicmd)
 {
        struct av7110* av7110 = fe->dvb->priv;
 
@@ -2055,7 +2054,8 @@ static int av7110_fe_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_
        return ret;
 }
 
-static int av7110_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int av7110_fe_set_tone(struct dvb_frontend *fe,
+                             enum fe_sec_tone_mode tone)
 {
        struct av7110* av7110 = fe->dvb->priv;
 
@@ -2067,7 +2067,8 @@ static int av7110_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
        return ret;
 }
 
-static int av7110_fe_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+static int av7110_fe_set_voltage(struct dvb_frontend *fe,
+                                enum fe_sec_voltage voltage)
 {
        struct av7110* av7110 = fe->dvb->priv;