diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-12-17 02:02:26 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 22:03:56 +0100 |
| commit | f7f427e4cc6078e23078dcd7f321676e0b0f544c (patch) | |
| tree | 61c68f36d39527be687d83d5e945e56465c1eec6 | |
| parent | V4L/DVB (6843): tda9887: use printk macros from tuner-i2c.h (diff) | |
| download | linux-f7f427e4cc6078e23078dcd7f321676e0b0f544c.tar.xz linux-f7f427e4cc6078e23078dcd7f321676e0b0f544c.zip | |
V4L/DVB (6844): tuner: remove struct tuner from tuner-driver.h
struct tuner holds state for tuner-core, only -- move it into tuner-core.c
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/tuner-core.c | 21 | ||||
| -rw-r--r-- | drivers/media/video/tuner-driver.h | 23 |
2 files changed, 21 insertions, 23 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index d51f3afa969d..f22c41bb97ef 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -33,6 +33,27 @@ #define PREFIX t->i2c->driver->driver.name +struct tuner { + /* device */ + struct dvb_frontend fe; + struct i2c_client *i2c; + struct list_head list; + unsigned int using_v4l2:1; + + /* keep track of the current settings */ + v4l2_std_id std; + unsigned int tv_freq; + unsigned int radio_freq; + unsigned int audmode; + + unsigned int mode; + unsigned int mode_mask; /* Combination of allowable modes */ + + unsigned int type; /* chip type id */ + unsigned int config; + int (*tuner_callback) (void *dev, int command, int arg); +}; + /* standard i2c insmod options */ static unsigned short normal_i2c[] = { #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE)) diff --git a/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h index 417753b7c3fa..7b1adfaf7aca 100644 --- a/drivers/media/video/tuner-driver.h +++ b/drivers/media/video/tuner-driver.h @@ -50,27 +50,4 @@ struct analog_tuner_ops { int (*set_config)(struct dvb_frontend *fe, void *priv_cfg); }; -struct tuner { - /* device */ - struct i2c_client *i2c; - struct list_head list; /* list of tuners */ - - unsigned int type; /* chip type */ - - unsigned int mode; - unsigned int mode_mask; /* Combination of allowable modes */ - - unsigned int tv_freq; /* keep track of the current settings */ - unsigned int radio_freq; - unsigned int audmode; - v4l2_std_id std; - - int using_v4l2; - - struct dvb_frontend fe; - - unsigned int config; - int (*tuner_callback) (void *dev, int command,int arg); -}; - #endif /* __TUNER_DRIVER_H__ */ |