Skip to content

Commit

Permalink
V4L/DVB (6786): tuner: add struct analog_demod_info to struct analog_…
Browse files Browse the repository at this point in the history
…tuner_ops

Store the analog demodulator name in fe.ops.analog_demod_ops.info.name

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 Jan 25, 2008
1 parent ab16605 commit a55db8c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/media/video/tda8290.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,9 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
}

static struct analog_tuner_ops tda8290_tuner_ops = {
.info = {
.name = "TDA8290",
},
.set_params = tda8290_set_params,
.has_signal = tda8290_has_signal,
.standby = tda8290_standby,
Expand All @@ -644,6 +647,9 @@ static struct analog_tuner_ops tda8290_tuner_ops = {
};

static struct analog_tuner_ops tda8295_tuner_ops = {
.info = {
.name = "TDA8295",
},
.set_params = tda8295_set_params,
.has_signal = tda8295_has_signal,
.standby = tda8295_standby,
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/video/tda9887.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,9 @@ static void tda9887_release(struct dvb_frontend *fe)
}

static struct analog_tuner_ops tda9887_tuner_ops = {
.info = {
.name = "TDA9887",
},
.set_params = tda9887_set_params,
.standby = tda9887_standby,
.tuner_status = tda9887_tuner_status,
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/video/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@ static void set_type(struct i2c_client *c, unsigned int type,

t->fe.ops.analog_demod_ops = &tuner_core_ops;
t->fe.analog_demod_priv = t;
} else {
strlcpy(t->i2c->name, ops->info.name,
sizeof(t->i2c->name));
}

tuner_dbg("type set to %s\n", t->i2c->name);
Expand Down
7 changes: 7 additions & 0 deletions drivers/media/video/tuner-driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@

extern unsigned const int tuner_count;

struct analog_demod_info {
char name[128];
};

struct analog_tuner_ops {

struct analog_demod_info info;

void (*set_params)(struct dvb_frontend *fe,
struct analog_parameters *params);
int (*has_signal)(struct dvb_frontend *fe);
Expand Down

0 comments on commit a55db8c

Please sign in to comment.