Skip to content

Commit

Permalink
V4L/DVB (9051): dib0700: use dvb_frontend->callback for xc5000 gpio r…
Browse files Browse the repository at this point in the history
…eset

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>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent d7cba04 commit 767f3b3
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/media/dvb/dvb-usb/dib0700_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 */
Expand Down

0 comments on commit 767f3b3

Please sign in to comment.