diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-25 09:47:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 09:37:09 -0200 |
| commit | 767f3b3bf23244d52be0492df20b0eaf14f501c5 (patch) | |
| tree | a53cb57f24b2ef8ac249eabc473130d52cb197f0 | |
| parent | d7cba043d7ec840d67bd5143779d1febe7d83407 (diff) | |
V4L/DVB (9051): dib0700: use dvb_frontend->callback for xc5000 gpio reset
The tuner_callback function pointer from struct xc5000_config has been removed.
Use dvb_frontend->callback instead.
Also, mark function dib0700_xc5000_tuner_callback as static int.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 8b74e13a6460..9891ca0924a3 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -1176,7 +1176,8 @@ static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap) return adap->fe == NULL ? -ENODEV : 0; } -int dib0700_xc5000_tuner_callback(void *priv, int command, int arg) +static int dib0700_xc5000_tuner_callback(void *priv, int component, + int command, int arg) { struct dvb_usb_adapter *adap = priv; @@ -1192,14 +1193,16 @@ int dib0700_xc5000_tuner_callback(void *priv, int command, int arg) static struct xc5000_config s5h1411_xc5000_tunerconfig = { .i2c_address = 0x64, .if_khz = 5380, - .tuner_callback = dib0700_xc5000_tuner_callback }; static int xc5000_tuner_attach(struct dvb_usb_adapter *adap) { return dvb_attach(xc5000_attach, adap->fe, &adap->dev->i2c_adap, - &s5h1411_xc5000_tunerconfig, adap) + &s5h1411_xc5000_tunerconfig) == NULL ? -ENODEV : 0; + + /* FIXME: generalize & move to common area */ + adap->fe->callback = dib0700_xc5000_tuner_callback; } /* DVB-USB and USB stuff follows */ |