Commit 767f3b3b authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

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: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d7cba043
...@@ -1176,7 +1176,8 @@ static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -1176,7 +1176,8 @@ static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap)
return adap->fe == NULL ? -ENODEV : 0; 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; struct dvb_usb_adapter *adap = priv;
...@@ -1192,14 +1193,16 @@ int dib0700_xc5000_tuner_callback(void *priv, int command, int arg) ...@@ -1192,14 +1193,16 @@ int dib0700_xc5000_tuner_callback(void *priv, int command, int arg)
static struct xc5000_config s5h1411_xc5000_tunerconfig = { static struct xc5000_config s5h1411_xc5000_tunerconfig = {
.i2c_address = 0x64, .i2c_address = 0x64,
.if_khz = 5380, .if_khz = 5380,
.tuner_callback = dib0700_xc5000_tuner_callback
}; };
static int xc5000_tuner_attach(struct dvb_usb_adapter *adap) static int xc5000_tuner_attach(struct dvb_usb_adapter *adap)
{ {
return dvb_attach(xc5000_attach, adap->fe, &adap->dev->i2c_adap, return dvb_attach(xc5000_attach, adap->fe, &adap->dev->i2c_adap,
&s5h1411_xc5000_tunerconfig, adap) &s5h1411_xc5000_tunerconfig)
== NULL ? -ENODEV : 0; == NULL ? -ENODEV : 0;
/* FIXME: generalize & move to common area */
adap->fe->callback = dib0700_xc5000_tuner_callback;
} }
/* DVB-USB and USB stuff follows */ /* DVB-USB and USB stuff follows */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment