aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-06-12 11:40:35 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:15 -0400
commit865dd115c95df6997f3d9dd638e6f92298f0422f (patch)
tree53e60efd24a0cd7d396449a0c8d04900739f2737 /drivers/media
parent4ce15678926cef4886df46964142fc2520c216cd (diff)
V4L/DVB (5778): Dvb-usb: kill unused tuner/i2c functions
These two functions are no longer being used: dvb_usb_tuner_init_i2c dvb_usb_tuner_set_params_i2c This functionality has been taken over by dvb-pll Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-i2c.c59
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb.h8
2 files changed, 0 insertions, 67 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 5792951b990e..23428cd30756 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -46,62 +46,3 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d)
46 d->state &= ~DVB_USB_STATE_I2C; 46 d->state &= ~DVB_USB_STATE_I2C;
47 return 0; 47 return 0;
48} 48}
49
50int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
51{
52 struct dvb_usb_adapter *adap = fe->dvb->priv;
53 struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = adap->pll_init, .len = 4 };
54 int ret = 0;
55
56 /* if pll_desc is not used */
57 if (adap->pll_desc == NULL)
58 return 0;
59
60 if (adap->tuner_pass_ctrl)
61 adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
62
63 deb_pll("pll init: %x\n",adap->pll_addr);
64 deb_pll("pll-buf: %x %x %x %x\n",adap->pll_init[0], adap->pll_init[1],
65 adap->pll_init[2], adap->pll_init[3]);
66
67 if (fe->ops.i2c_gate_ctrl)
68 fe->ops.i2c_gate_ctrl(fe, 1);
69 if (i2c_transfer (&adap->dev->i2c_adap, &msg, 1) != 1) {
70 err("tuner i2c write failed for pll_init.");
71 ret = -EREMOTEIO;
72 }
73 msleep(1);
74
75 if (adap->tuner_pass_ctrl)
76 adap->tuner_pass_ctrl(fe,0,adap->pll_addr);
77 return ret;
78}
79EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);
80
81int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
82{
83 struct dvb_usb_adapter *adap = fe->dvb->priv;
84 int ret = 0;
85 u8 b[5];
86 struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
87
88 fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
89
90 if (adap->tuner_pass_ctrl)
91 adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
92
93 if (fe->ops.i2c_gate_ctrl)
94 fe->ops.i2c_gate_ctrl(fe, 1);
95
96 if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {
97 err("tuner i2c write failed for pll_set.");
98 ret = -EREMOTEIO;
99 }
100 msleep(1);
101
102 if (adap->tuner_pass_ctrl)
103 adap->tuner_pass_ctrl(fe, 0, adap->pll_addr);
104
105 return ret;
106}
107EXPORT_SYMBOL(dvb_usb_tuner_set_params_i2c);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index d008a24c247a..70be200665e4 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -297,10 +297,6 @@ struct dvb_usb_adapter {
297 int feedcount; 297 int feedcount;
298 int pid_filtering; 298 int pid_filtering;
299 299
300 /* tuner programming information */
301 u8 pll_addr;
302 u8 pll_init[4];
303 struct dvb_pll_desc *pll_desc;
304 int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8); 300 int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);
305 301
306 /* dvb */ 302 /* dvb */
@@ -388,10 +384,6 @@ extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);
388/* commonly used remote control parsing */ 384/* commonly used remote control parsing */
389extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *); 385extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);
390 386
391/* commonly used pll init and set functions */
392extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);
393extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
394
395/* commonly used firmware download types and function */ 387/* commonly used firmware download types and function */
396struct hexline { 388struct hexline {
397 u8 len; 389 u8 len;