Skip to content

Commit

Permalink
V4L/DVB (6227): dvb-pll: store instance ID in dvb_pll_priv structure
Browse files Browse the repository at this point in the history
Store an instance ID in the dvb_pll_priv structure, so that module options
specific to a given pll may be used by the functions within the driver.

When debug is turned on, print a message indicating which pll was attached
and it's instance id.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent 5d7802b commit a27e5e7
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions drivers/media/dvb/frontends/dvb-pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,9 @@ static struct dvb_pll_desc *pll_list[] = {
/* ----------------------------------------------------------- */

struct dvb_pll_priv {
/* pll number */
int nr;

/* i2c details */
int pll_i2c_address;
struct i2c_adapter *i2c;
Expand All @@ -575,6 +578,8 @@ static int debug = 0;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages");

static unsigned int dvb_pll_devcount;

static int dvb_pll_configure(struct dvb_frontend *fe, u8 *buf,
const struct dvb_frontend_parameters *params)
{
Expand Down Expand Up @@ -787,6 +792,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
priv->pll_i2c_address = pll_addr;
priv->i2c = i2c;
priv->pll_desc = desc;
priv->nr = dvb_pll_devcount++;

memcpy(&fe->ops.tuner_ops, &dvb_pll_tuner_ops,
sizeof(struct dvb_tuner_ops));
Expand All @@ -801,6 +807,14 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
fe->ops.tuner_ops.sleep = NULL;

fe->tuner_priv = priv;

if (debug) {
printk("dvb-pll[%d]", priv->nr);
if (i2c != NULL)
printk(" %d-%04x", i2c_adapter_id(i2c), pll_addr);
printk(": id# %d (%s) attached\n", pll_desc_id, desc->name);
}

return fe;
}
EXPORT_SYMBOL(dvb_pll_attach);
Expand Down

0 comments on commit a27e5e7

Please sign in to comment.