V4L/DVB (6127): tuner: kill i2c_client interface to tuner sub-drivers

[linux-2.6] / drivers / media / video / tuner-driver.h

diff --git a/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h
index 145045561a510ea6b4bd2ff961649ad6843a6bb8..3cd1d446f2f34173ce2e0df35ca997f1cc425262 100644 (file)
--- a/drivers/media/video/tuner-driver.h
+++ b/drivers/media/video/tuner-driver.h
@@ -24,18 +24,21 @@
 
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
+#include "tuner-i2c.h"
 
 extern unsigned const int tuner_count;
 
+struct tuner;
+
 struct tuner_operations {
-       void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
-       void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);
-       int  (*has_signal)(struct i2c_client *c);
-       int  (*is_stereo)(struct i2c_client *c);
-       int  (*get_afc)(struct i2c_client *c);
-       void (*tuner_status)(struct i2c_client *c);
-       void (*standby)(struct i2c_client *c);
-       void (*release)(struct i2c_client *c);
+       void (*set_tv_freq)(struct tuner *t, unsigned int freq);
+       void (*set_radio_freq)(struct tuner *t, unsigned int freq);
+       int  (*has_signal)(struct tuner *t);
+       int  (*is_stereo)(struct tuner *t);
+       int  (*get_afc)(struct tuner *t);
+       void (*tuner_status)(struct tuner *t);
+       void (*standby)(struct tuner *t);
+       void (*release)(struct tuner *t);
 };
 
 struct tuner {
@@ -66,20 +69,20 @@ struct tuner {
 
 /* ------------------------------------------------------------------------ */
 
-extern int default_tuner_init(struct i2c_client *c);
+extern int default_tuner_init(struct tuner *t);
 
-extern int tda9887_tuner_init(struct i2c_client *c);
+extern int tda9887_tuner_init(struct tuner *t);
 
-extern int microtune_init(struct i2c_client *c);
+extern int microtune_init(struct tuner *t);
 
-extern int tda8290_init(struct i2c_client *c);
-extern int tda8290_probe(struct i2c_client *c);
+extern int tda8290_init(struct tuner *t);
+extern int tda8290_probe(struct tuner *t);
 
-extern int tea5761_tuner_init(struct i2c_client *c);
-extern int tea5761_autodetection(struct i2c_client *c);
+extern int tea5761_tuner_init(struct tuner *t);
+extern int tea5761_autodetection(struct tuner *t);
 
-extern int tea5767_autodetection(struct i2c_client *c);
-extern int tea5767_tuner_init(struct i2c_client *c);
+extern int tea5767_autodetection(struct tuner *t);
+extern int tea5767_tuner_init(struct tuner *t);
 
 /* ------------------------------------------------------------------------ */