Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9dd659de9fbd1687c6175053c6453db5b932f152
Commit:     9dd659de9fbd1687c6175053c6453db5b932f152
Parent:     92de1f16d15a30831d1685949aeb76c99032ef23
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sun Nov 4 11:03:36 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:02:00 2008 -0200

    V4L/DVB (6556): tuner: convert to bus-based I2C API
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/mt20xx.c       |    2 +-
 drivers/media/video/tda8290.c      |    2 +-
 drivers/media/video/tea5761.c      |    2 +-
 drivers/media/video/tea5767.c      |    2 +-
 drivers/media/video/tuner-core.c   |   99 ++++++++++++------------------------
 drivers/media/video/tuner-driver.h |    6 +-
 drivers/media/video/tuner-i2c.h    |    6 +-
 drivers/media/video/tuner-simple.c |    2 +-
 drivers/media/video/tuner-xc2028.c |    2 +-
 9 files changed, 44 insertions(+), 79 deletions(-)

diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index f49d1f4..b630c26 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -14,7 +14,7 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "mt20xx "
+#define PREFIX "mt20xx"
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index f0191ba..a849ded 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -31,7 +31,7 @@ static int tuner_debug;
 module_param_named(debug, tuner_debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "tda8290 "
+#define PREFIX "tda8290"
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/drivers/media/video/tea5761.c b/drivers/media/video/tea5761.c
index 2150222..5326eec 100644
--- a/drivers/media/video/tea5761.c
+++ b/drivers/media/video/tea5761.c
@@ -18,7 +18,7 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "tea5761 "
+#define PREFIX "tea5761"
 
 struct tea5761_priv {
        struct tuner_i2c_props i2c_props;
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index 2d2acbd..2f5a99d 100644
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -20,7 +20,7 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "tea5767 "
+#define PREFIX "tea5767"
 
 /*****************************************************************************/
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 48b2d46..1b0d28a 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -19,6 +19,7 @@
 #include <media/tuner.h>
 #include <media/tuner-types.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tuner-driver.h"
 #include "mt20xx.h"
 #include "tda8290.h"
@@ -30,7 +31,7 @@
 
 #define UNSET (-1U)
 
-#define PREFIX "tuner "
+#define PREFIX t->i2c->driver->driver.name
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
@@ -75,9 +76,6 @@ MODULE_DESCRIPTION("device driver for various TV and TV+FM 
radio tuners");
 MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
 MODULE_LICENSE("GPL");
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 /* ---------------------------------------------------------------------- */
 
 static void fe_set_freq(struct dvb_frontend *fe, unsigned int freq)
@@ -919,18 +917,18 @@ static int tuner_command(struct i2c_client *client, 
unsigned int cmd, void *arg)
 
 static int tuner_suspend(struct i2c_client *c, pm_message_t state)
 {
-       struct tuner *t = i2c_get_clientdata (c);
+       struct tuner *t = i2c_get_clientdata(c);
 
-       tuner_dbg ("suspend\n");
+       tuner_dbg("suspend\n");
        /* FIXME: power down ??? */
        return 0;
 }
 
 static int tuner_resume(struct i2c_client *c)
 {
-       struct tuner *t = i2c_get_clientdata (c);
+       struct tuner *t = i2c_get_clientdata(c);
 
-       tuner_dbg ("resume\n");
+       tuner_dbg("resume\n");
        if (V4L2_TUNER_RADIO == t->mode) {
                if (t->radio_freq)
                        set_freq(c, t->radio_freq);
@@ -946,7 +944,7 @@ static int tuner_resume(struct i2c_client *c)
 LIST_HEAD(tuner_list);
 
 /* Search for existing radio and/or TV tuners on the given I2C adapter.
-   Note that when this function is called from tuner_attach you can be
+   Note that when this function is called from tuner_probe you can be
    certain no other devices will be added/deleted at the same time, I2C
    core protects against that. */
 static void tuner_lookup(struct i2c_adapter *adap,
@@ -977,28 +975,19 @@ static void tuner_lookup(struct i2c_adapter *adap,
 }
 
 /* During client attach, set_type is called by adapter's attach_inform 
callback.
-   set_type must then be completed by tuner_attach.
+   set_type must then be completed by tuner_probe.
  */
-static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
+static int tuner_probe(struct i2c_client *client)
 {
-       struct i2c_client *client;
        struct tuner *t;
        struct tuner *radio;
        struct tuner *tv;
 
-       client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (NULL == client)
-               return -ENOMEM;
-
        t = kzalloc(sizeof(struct tuner), GFP_KERNEL);
-       if (NULL == t) {
-               kfree(client);
+       if (NULL == t)
                return -ENOMEM;
-       }
        t->i2c = client;
-       client_template.adapter = adap;
-       client_template.addr = addr;
-       memcpy(client, &client_template, sizeof(struct i2c_client));
+       strlcpy(client->name, "(tuner unset)", sizeof(client->name));
        i2c_set_clientdata(client, t);
        t->type = UNSET;
        t->audmode = V4L2_TUNER_MODE_STEREO;
@@ -1015,14 +1004,16 @@ static int tuner_attach(struct i2c_adapter *adap, int 
addr, int kind)
                        printk(KERN_CONT "%02x ", buffer[i]);
                printk("\n");
        }
-       /* HACK: This test were added to avoid tuner to probe tda9840 and
+       /* HACK: This test was added to avoid tuner to probe tda9840 and
           tea6415c on the MXB card */
-       if (adap->id == I2C_HW_SAA7146 && addr < 0x4a)
+       if (client->adapter->id == I2C_HW_SAA7146 && client->addr < 0x4a) {
+               kfree(t);
                return -ENODEV;
+       }
 
        /* autodetection code based on the i2c addr */
        if (!no_autodetect) {
-               switch (addr) {
+               switch (client->addr) {
                case 0x10:
                        if (tea5761_autodetection(t->i2c->adapter, t->i2c->addr)
                                        != EINVAL) {
@@ -1092,7 +1083,8 @@ static int tuner_attach(struct i2c_adapter *adap, int 
addr, int kind)
 
        /* Should be just before return */
 register_client:
-       tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
+       tuner_info("chip found @ 0x%x (%s)\n", client->addr << 1,
+                      client->adapter->name);
 
        /* Sets a default mode */
        if (t->mode_mask & T_ANALOG_TV) {
@@ -1102,19 +1094,21 @@ register_client:
        } else {
                t->mode = T_DIGITAL_TV;
        }
-
-       i2c_attach_client(client);
        set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback);
+       list_add_tail(&t->list, &tuner_list);
        return 0;
 }
 
-static int tuner_probe(struct i2c_adapter *adap)
+static int tuner_legacy_probe(struct i2c_adapter *adap)
 {
        if (0 != addr) {
                normal_i2c[0] = addr;
                normal_i2c[1] = I2C_CLIENT_END;
        }
 
+       if ((adap->class & I2C_CLASS_TV_ANALOG) == 0)
+               return 0;
+
        /* HACK: Ignore 0x6b and 0x6f on cx88 boards.
         * FusionHDTV5 RT Gold has an ir receiver at 0x6b
         * and an RTC at 0x6f which can get corrupted if probed.
@@ -1136,64 +1130,35 @@ static int tuner_probe(struct i2c_adapter *adap)
                               "too many options specified "
                               "in i2c probe ignore list!\n");
        }
-
-       if (adap->class & I2C_CLASS_TV_ANALOG)
-               return i2c_probe(adap, &addr_data, tuner_attach);
-       return 0;
+       return 1;
 }
 
-static int tuner_detach(struct i2c_client *client)
+static int tuner_remove(struct i2c_client *client)
 {
        struct tuner *t = i2c_get_clientdata(client);
        struct analog_tuner_ops *ops = t->fe.ops.analog_demod_ops;
-       int err;
-
-       err = i2c_detach_client(t->i2c);
-       if (err) {
-               tuner_warn
-                   ("Client deregistration failed, client not detached.\n");
-               return err;
-       }
 
        if (ops && ops->release)
                ops->release(&t->fe);
 
        list_del(&t->list);
        kfree(t);
-       kfree(client);
        return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_driver driver = {
-       .id = I2C_DRIVERID_TUNER,
-       .attach_adapter = tuner_probe,
-       .detach_client = tuner_detach,
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "tuner",
+       .driverid = I2C_DRIVERID_TUNER,
        .command = tuner_command,
+       .probe = tuner_probe,
+       .remove = tuner_remove,
        .suspend = tuner_suspend,
-       .resume  = tuner_resume,
-       .driver = {
-               .name    = "tuner",
-       },
+       .resume = tuner_resume,
+       .legacy_probe = tuner_legacy_probe,
 };
-static struct i2c_client client_template = {
-       .name = "(tuner unset)",
-       .driver = &driver,
-};
-
-static int __init tuner_init_module(void)
-{
-       return i2c_add_driver(&driver);
-}
-
-static void __exit tuner_cleanup_module(void)
-{
-       i2c_del_driver(&driver);
-}
 
-module_init(tuner_init_module);
-module_exit(tuner_cleanup_module);
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
diff --git a/drivers/media/video/tuner-driver.h 
b/drivers/media/video/tuner-driver.h
index 3ff2943..d6e5afd 100644
--- a/drivers/media/video/tuner-driver.h
+++ b/drivers/media/video/tuner-driver.h
@@ -72,15 +72,15 @@ struct tuner {
 /* ------------------------------------------------------------------------ */
 
 #define tuner_warn(fmt, arg...) do {\
-       printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
+       printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); 
} while (0)
 #define tuner_info(fmt, arg...) do {\
-       printk(KERN_INFO PREFIX "%d-%04x: " fmt, \
+       printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); 
} while (0)
 #define tuner_dbg(fmt, arg...) do {\
        extern int tuner_debug; \
        if (tuner_debug) \
-               printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
+               printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); 
} while (0)
 
 #endif /* __TUNER_DRIVER_H__ */
diff --git a/drivers/media/video/tuner-i2c.h b/drivers/media/video/tuner-i2c.h
index 159019e..cfba3d1 100644
--- a/drivers/media/video/tuner-i2c.h
+++ b/drivers/media/video/tuner-i2c.h
@@ -48,14 +48,14 @@ static inline int tuner_i2c_xfer_recv(struct 
tuner_i2c_props *props, char *buf,
 
 #ifndef __TUNER_DRIVER_H__
 #define tuner_warn(fmt, arg...) do {\
-       printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
+       printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(priv->i2c_props.adap), 
priv->i2c_props.addr , ##arg); } while (0)
 #define tuner_info(fmt, arg...) do {\
-       printk(KERN_INFO PREFIX "%d-%04x: " fmt, \
+       printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(priv->i2c_props.adap), 
priv->i2c_props.addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
        if ((debug)) \
-               printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
+               printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
                        i2c_adapter_id(priv->i2c_props.adap), 
priv->i2c_props.addr , ##arg); } while (0)
 #endif /* __TUNER_DRIVER_H__ */
 
diff --git a/drivers/media/video/tuner-simple.c 
b/drivers/media/video/tuner-simple.c
index eec13cb..c1db576 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -17,7 +17,7 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "tuner-simple "
+#define PREFIX "tuner-simple"
 
 static int offset = 0;
 module_param(offset, int, 0664);
diff --git a/drivers/media/video/tuner-xc2028.c 
b/drivers/media/video/tuner-xc2028.c
index 473fa73..80d1402 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -22,7 +22,7 @@
 #include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
-#define PREFIX "xc2028 "
+#define PREFIX "xc2028"
 
 static LIST_HEAD(xc2028_list);
 /* struct for storing firmware table */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to