diff options
author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-08-08 08:10:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 10:53:25 -0400 |
commit | 2bfe031df6bd5e3b8e503eba8e3b6461d7c2c27e (patch) | |
tree | 2d7288c2221fb6f7ef98ef7a1ee3fef3f04cf87e /drivers/media/dvb/frontends/dvb-pll.c | |
parent | d995506062c974133ba66d0822e58a923d4d74d9 (diff) |
V4L/DVB (4386): Convert DVB devices to use dvb_attach()
Only devices using > 1 frontend were ported; ones which did not are left
using static binding.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/dvb-pll.c')
-rw-r--r-- | drivers/media/dvb/frontends/dvb-pll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c index 2be33f27c69f..c92877baada2 100644 --- a/drivers/media/dvb/frontends/dvb-pll.c +++ b/drivers/media/dvb/frontends/dvb-pll.c | |||
@@ -611,7 +611,7 @@ static struct dvb_tuner_ops dvb_pll_tuner_ops = { | |||
611 | .get_bandwidth = dvb_pll_get_bandwidth, | 611 | .get_bandwidth = dvb_pll_get_bandwidth, |
612 | }; | 612 | }; |
613 | 613 | ||
614 | int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc) | 614 | struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc) |
615 | { | 615 | { |
616 | u8 b1 [] = { 0 }; | 616 | u8 b1 [] = { 0 }; |
617 | struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }; | 617 | struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }; |
@@ -624,14 +624,14 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2 | |||
624 | 624 | ||
625 | ret = i2c_transfer (i2c, &msg, 1); | 625 | ret = i2c_transfer (i2c, &msg, 1); |
626 | if (ret != 1) | 626 | if (ret != 1) |
627 | return -1; | 627 | return NULL; |
628 | if (fe->ops.i2c_gate_ctrl) | 628 | if (fe->ops.i2c_gate_ctrl) |
629 | fe->ops.i2c_gate_ctrl(fe, 0); | 629 | fe->ops.i2c_gate_ctrl(fe, 0); |
630 | } | 630 | } |
631 | 631 | ||
632 | priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL); | 632 | priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL); |
633 | if (priv == NULL) | 633 | if (priv == NULL) |
634 | return -ENOMEM; | 634 | return NULL; |
635 | 635 | ||
636 | priv->pll_i2c_address = pll_addr; | 636 | priv->pll_i2c_address = pll_addr; |
637 | priv->i2c = i2c; | 637 | priv->i2c = i2c; |
@@ -643,7 +643,7 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2 | |||
643 | fe->ops.tuner_ops.info.frequency_min = desc->max; | 643 | fe->ops.tuner_ops.info.frequency_min = desc->max; |
644 | 644 | ||
645 | fe->tuner_priv = priv; | 645 | fe->tuner_priv = priv; |
646 | return 0; | 646 | return fe; |
647 | } | 647 | } |
648 | EXPORT_SYMBOL(dvb_pll_attach); | 648 | EXPORT_SYMBOL(dvb_pll_attach); |
649 | 649 | ||