diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-25 08:47:07 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-25 08:47:07 -0400 |
| commit | b21333aab210fe38e84f8311a9d921e696bf8f9b (patch) | |
| tree | 24f953f98cdafd41aa5fe502b163bc69ff314503 /linux/drivers/media | |
| parent | 7e39de54b4ed06bb2ababbe72b16f195d796d8f0 (diff) | |
| download | mediapointer-dvb-s2-b21333aab210fe38e84f8311a9d921e696bf8f9b.tar.gz mediapointer-dvb-s2-b21333aab210fe38e84f8311a9d921e696bf8f9b.tar.bz2 | |
dib0700: use dvb_frontend->callback for xc5000 gpio reset
From: Michael Krufky <mkrufky@linuxtv.org>
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.
Priority: normal
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c index 8b74e13a6..9891ca092 100644 --- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/linux/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 */ |