summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/dvb-pll.c
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-06-02 12:30:46 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2007-06-02 12:30:46 -0700
commit67b3fb453439e760a261173dded37177b6c76aa0 (patch)
tree6e4abe456b2d31d85dc4cfe5ae831744bdb4a11f /linux/drivers/media/dvb/frontends/dvb-pll.c
parent35133745a136eb4cdf08bd6095e5ab2c0d7d6c07 (diff)
downloadmediapointer-dvb-s2-67b3fb453439e760a261173dded37177b6c76aa0.tar.gz
mediapointer-dvb-s2-67b3fb453439e760a261173dded37177b6c76aa0.tar.bz2
dvb-pll digitv dvb-usb: Eliminate last user of dvb_pll_configure
From: Trent Piepho <xyzzy@speakeasy.org> The last user of dvb_pll_configure was the dvb-usb function dvb_usb_tuner_calc_regs(), which was nothing more than a wrapper around dvb_pll_configure(). It's just a copy of the functionality provided by the tuner_ops calc_regs method, and can be deleted. There were two users of dvb_usb_tuner_calc_regs(). One was dvb_usb_tuner_set_params_i2c(), which is converted to use fe->ops.tuner_ops.calc_regs(). The other was the digitv driver. This driver can use one of two demods, mt352 or nxt6000. For the mt352, the driver would set tuner_ops.calc_regs to dvb_usb_tuner_calc_regs(). We can just attach dvb_pll and use the tuner_ops.calc_regs() provided by that module. For the nxt600, the driver would set tuner_ops.set_params to digitv_nxt6000_tuner_set_params. That function would in turn use dvb_usb_tuner_calc_regs(). We convert it to use tuner_ops.calc_regs() instead, and use dvb_pll_attach. The digitv_tuner_attach() needs to know which frontend was attached by digitv_frontend_attach(), since the nxt6000 needs tuner_ops.set_params() to be overridden with digitv_nxt6000_tuner_set_params(). So to do this a digitv_state that says which frontend was used is added to the dvb_usb_device private state field. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/dvb-pll.c')
-rw-r--r--linux/drivers/media/dvb/frontends/dvb-pll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/dvb-pll.c b/linux/drivers/media/dvb/frontends/dvb-pll.c
index 9fb4deceb..5c26fa112 100644
--- a/linux/drivers/media/dvb/frontends/dvb-pll.c
+++ b/linux/drivers/media/dvb/frontends/dvb-pll.c
@@ -522,8 +522,8 @@ static int debug = 0;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages");
-int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
- const struct dvb_frontend_parameters *params)
+static int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
+ const struct dvb_frontend_parameters *params)
{
u32 div;
int i;