diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-12 12:31:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:09 -0400 |
commit | d7cba043d7ec840d67bd5143779d1febe7d83407 (patch) | |
tree | 4fb46684538e0ad7d3229f592182ed6121049d69 /drivers/media/common/tuners/xc5000.c | |
parent | ebb8d68a5c8c236acd8e8cf8f0d6046e027a8e21 (diff) |
V4L/DVB (9049): convert tuner drivers to use dvb_frontend->callback
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners/xc5000.c')
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index ccc4dae4126..f9c2bb917f5 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -58,8 +58,6 @@ struct xc5000_priv { | |||
58 | u32 bandwidth; | 58 | u32 bandwidth; |
59 | u8 video_standard; | 59 | u8 video_standard; |
60 | u8 rf_mode; | 60 | u8 rf_mode; |
61 | |||
62 | int (*tuner_callback) (void *priv, int command, int arg); | ||
63 | }; | 61 | }; |
64 | 62 | ||
65 | /* Misc Defines */ | 63 | /* Misc Defines */ |
@@ -232,10 +230,11 @@ static void xc5000_TunerReset(struct dvb_frontend *fe) | |||
232 | 230 | ||
233 | dprintk(1, "%s()\n", __func__); | 231 | dprintk(1, "%s()\n", __func__); |
234 | 232 | ||
235 | if (priv->tuner_callback) { | 233 | if (fe->callback) { |
236 | ret = priv->tuner_callback(((fe->dvb) && (fe->dvb->priv)) ? | 234 | ret = fe->callback(((fe->dvb) && (fe->dvb->priv)) ? |
237 | fe->dvb->priv : | 235 | fe->dvb->priv : |
238 | priv->i2c_props.adap->algo_data, | 236 | priv->i2c_props.adap->algo_data, |
237 | DVB_FRONTEND_COMPONENT_TUNER, | ||
239 | XC5000_TUNER_RESET, 0); | 238 | XC5000_TUNER_RESET, 0); |
240 | if (ret) | 239 | if (ret) |
241 | printk(KERN_ERR "xc5000: reset failed\n"); | 240 | printk(KERN_ERR "xc5000: reset failed\n"); |
@@ -975,7 +974,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, | |||
975 | /* new tuner instance */ | 974 | /* new tuner instance */ |
976 | priv->bandwidth = BANDWIDTH_6_MHZ; | 975 | priv->bandwidth = BANDWIDTH_6_MHZ; |
977 | priv->if_khz = cfg->if_khz; | 976 | priv->if_khz = cfg->if_khz; |
978 | priv->tuner_callback = cfg->tuner_callback; | ||
979 | 977 | ||
980 | fe->tuner_priv = priv; | 978 | fe->tuner_priv = priv; |
981 | break; | 979 | break; |