diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-04-17 21:24:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 18:48:12 -0400 |
commit | 68592773e35cafdf2a17ceaaf8553513ed4c86aa (patch) | |
tree | c18c10d65ad8c3c4ad9ab7d9649d2d8d9661e1e1 | |
parent | fff287bb22fd8113fa086114037df4b07e2f69de (diff) |
[media] bt8xx: make driver routines fit into its own namespcae
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>
-rw-r--r-- | drivers/media/pci/bt8xx/dst.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c index 430b3eb11815..f2261dfe5d1a 100644 --- a/drivers/media/pci/bt8xx/dst.c +++ b/drivers/media/pci/bt8xx/dst.c | |||
@@ -1544,7 +1544,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd) | |||
1544 | } | 1544 | } |
1545 | 1545 | ||
1546 | 1546 | ||
1547 | static int dst_init(struct dvb_frontend *fe) | 1547 | static int bt8xx_dst_init(struct dvb_frontend *fe) |
1548 | { | 1548 | { |
1549 | struct dst_state *state = fe->demodulator_priv; | 1549 | struct dst_state *state = fe->demodulator_priv; |
1550 | 1550 | ||
@@ -1707,7 +1707,7 @@ static int dst_get_frontend(struct dvb_frontend *fe) | |||
1707 | return 0; | 1707 | return 0; |
1708 | } | 1708 | } |
1709 | 1709 | ||
1710 | static void dst_release(struct dvb_frontend *fe) | 1710 | static void bt8xx_dst_release(struct dvb_frontend *fe) |
1711 | { | 1711 | { |
1712 | struct dst_state *state = fe->demodulator_priv; | 1712 | struct dst_state *state = fe->demodulator_priv; |
1713 | if (state->dst_ca) { | 1713 | if (state->dst_ca) { |
@@ -1776,8 +1776,8 @@ static struct dvb_frontend_ops dst_dvbt_ops = { | |||
1776 | FE_CAN_GUARD_INTERVAL_AUTO | 1776 | FE_CAN_GUARD_INTERVAL_AUTO |
1777 | }, | 1777 | }, |
1778 | 1778 | ||
1779 | .release = dst_release, | 1779 | .release = bt8xx_dst_release, |
1780 | .init = dst_init, | 1780 | .init = bt8xx_dst_init, |
1781 | .tune = dst_tune_frontend, | 1781 | .tune = dst_tune_frontend, |
1782 | .set_frontend = dst_set_frontend, | 1782 | .set_frontend = dst_set_frontend, |
1783 | .get_frontend = dst_get_frontend, | 1783 | .get_frontend = dst_get_frontend, |
@@ -1801,8 +1801,8 @@ static struct dvb_frontend_ops dst_dvbs_ops = { | |||
1801 | .caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK | 1801 | .caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK |
1802 | }, | 1802 | }, |
1803 | 1803 | ||
1804 | .release = dst_release, | 1804 | .release = bt8xx_dst_release, |
1805 | .init = dst_init, | 1805 | .init = bt8xx_dst_init, |
1806 | .tune = dst_tune_frontend, | 1806 | .tune = dst_tune_frontend, |
1807 | .set_frontend = dst_set_frontend, | 1807 | .set_frontend = dst_set_frontend, |
1808 | .get_frontend = dst_get_frontend, | 1808 | .get_frontend = dst_get_frontend, |
@@ -1834,8 +1834,8 @@ static struct dvb_frontend_ops dst_dvbc_ops = { | |||
1834 | FE_CAN_QAM_256 | 1834 | FE_CAN_QAM_256 |
1835 | }, | 1835 | }, |
1836 | 1836 | ||
1837 | .release = dst_release, | 1837 | .release = bt8xx_dst_release, |
1838 | .init = dst_init, | 1838 | .init = bt8xx_dst_init, |
1839 | .tune = dst_tune_frontend, | 1839 | .tune = dst_tune_frontend, |
1840 | .set_frontend = dst_set_frontend, | 1840 | .set_frontend = dst_set_frontend, |
1841 | .get_frontend = dst_get_frontend, | 1841 | .get_frontend = dst_get_frontend, |
@@ -1857,8 +1857,8 @@ static struct dvb_frontend_ops dst_atsc_ops = { | |||
1857 | .caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB | 1857 | .caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB |
1858 | }, | 1858 | }, |
1859 | 1859 | ||
1860 | .release = dst_release, | 1860 | .release = bt8xx_dst_release, |
1861 | .init = dst_init, | 1861 | .init = bt8xx_dst_init, |
1862 | .tune = dst_tune_frontend, | 1862 | .tune = dst_tune_frontend, |
1863 | .set_frontend = dst_set_frontend, | 1863 | .set_frontend = dst_set_frontend, |
1864 | .get_frontend = dst_get_frontend, | 1864 | .get_frontend = dst_get_frontend, |