[media] bt8xx: make driver routines fit into its own namespcae
authorLuis R. Rodriguez <mcgrof@suse.com>
Fri, 18 Apr 2014 01:24:44 +0000 (22:24 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 23 May 2014 22:48:12 +0000 (19:48 -0300)
There is a few conflicts with older symbols on older kernels so we
have to patch this driver when backporting. Instead just make these
routines specific to the driver.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/pci/bt8xx/dst.c

index 430b3eb118152c1c3606e4cf355f3a925777f672..f2261dfe5d1aea3b0b9ff67d50fe9e0dcefa58ae 100644 (file)
@@ -1544,7 +1544,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
 }
 
 
-static int dst_init(struct dvb_frontend *fe)
+static int bt8xx_dst_init(struct dvb_frontend *fe)
 {
        struct dst_state *state = fe->demodulator_priv;
 
@@ -1707,7 +1707,7 @@ static int dst_get_frontend(struct dvb_frontend *fe)
        return 0;
 }
 
-static void dst_release(struct dvb_frontend *fe)
+static void bt8xx_dst_release(struct dvb_frontend *fe)
 {
        struct dst_state *state = fe->demodulator_priv;
        if (state->dst_ca) {
@@ -1776,8 +1776,8 @@ static struct dvb_frontend_ops dst_dvbt_ops = {
                        FE_CAN_GUARD_INTERVAL_AUTO
        },
 
-       .release = dst_release,
-       .init = dst_init,
+       .release = bt8xx_dst_release,
+       .init = bt8xx_dst_init,
        .tune = dst_tune_frontend,
        .set_frontend = dst_set_frontend,
        .get_frontend = dst_get_frontend,
@@ -1801,8 +1801,8 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
                .caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK
        },
 
-       .release = dst_release,
-       .init = dst_init,
+       .release = bt8xx_dst_release,
+       .init = bt8xx_dst_init,
        .tune = dst_tune_frontend,
        .set_frontend = dst_set_frontend,
        .get_frontend = dst_get_frontend,
@@ -1834,8 +1834,8 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
                        FE_CAN_QAM_256
        },
 
-       .release = dst_release,
-       .init = dst_init,
+       .release = bt8xx_dst_release,
+       .init = bt8xx_dst_init,
        .tune = dst_tune_frontend,
        .set_frontend = dst_set_frontend,
        .get_frontend = dst_get_frontend,
@@ -1857,8 +1857,8 @@ static struct dvb_frontend_ops dst_atsc_ops = {
                .caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
        },
 
-       .release = dst_release,
-       .init = dst_init,
+       .release = bt8xx_dst_release,
+       .init = bt8xx_dst_init,
        .tune = dst_tune_frontend,
        .set_frontend = dst_set_frontend,
        .get_frontend = dst_get_frontend,