V4L/DVB (8630): First mxb cleanup phase

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 51 insertions, 96 deletions

diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index b5c8957d130e..e50820969e64 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -2,6 +2,7 @@
     tea6420 - i2c-driver for the tea6420 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tea6420 is a bus controlled audio-matrix with 5 stereo inputs,
     4 stereo outputs and gain control for each output.
@@ -30,15 +31,18 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tea6420.h"
 
-static int debug;               /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tea6420 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };
@@ -46,23 +50,20 @@ static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 /* make a connection between the input 'i' and the output 'o'
    with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */
 static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 {
-        u8 byte = 0;
+        u8 byte;
         int ret;
 
-        dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client->addr, i, o, g);
+        v4l_dbg(1, debug, client, "i=%d, o=%d, g=%d\n", i, o, g);
 
         /* check if the parameters are valid */
         if (i < 1 || i > 6 || o < 1 || o > 4 || g < 0 || g > 6 || g % 2 != 0)
                 return -1;
 
-        byte  = ((o - 1) << 5);
+        byte = ((o - 1) << 5);
         byte |= (i - 1);
 
         /* to understand this, have a look at the tea6420-specs (p.5) */
@@ -82,40 +83,41 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 
         ret = i2c_smbus_write_byte(client, byte);
         if (ret) {
-                dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);
+                v4l_dbg(1, debug, client,
+                        "i2c_smbus_write_byte() failed, ret:%d\n", ret);
                 return -EIO;
         }
-
         return 0;
 }
 
-/* this function is called by i2c_probe */
-static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
+static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-        struct i2c_client *client;
-        int err = 0, i = 0;
+        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
+        int result = 0;
 
-        /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {
-                return 0;
+        switch (cmd) {
+        case TEA6420_SWITCH:
+                result = tea6420_switch(client, a->in, a->out, a->gain);
+                break;
+        default:
+                return -ENOIOCTLCMD;
         }
 
-        /* allocate memory for client structure */
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                return -ENOMEM;
-        }
+        return result;
+}
 
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
+/* this function is called by i2c_probe */
+static int tea6420_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        int err, i;
 
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (err = i2c_attach_client(client))) {
-                kfree(client);
-                return err;
-        }
+        /* let's see whether this adapter can support what we need */
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE))
+                return -EIO;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
         /* set initial values: set "mute"-input to all outputs at gain 0 */
         err = 0;
@@ -123,78 +125,31 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
                 err += tea6420_switch(client, 6, i, 0);
         }
         if (err) {
-                dprintk("could not initialize tea6420\n");
+                v4l_dbg(1, debug, client, "could not initialize tea6420\n");
                 kfree(client);
                 return -ENODEV;
         }
-
-        printk("tea6420: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
-
         return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
+static int tea6420_legacy_probe(struct i2c_adapter *adapter)
 {
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &tea6420_detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
-}
-
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
-        int result = 0;
-
-        switch (cmd) {
-        case TEA6420_SWITCH:
-                result = tea6420_switch(client, a->in, a->out, a->gain);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
-
-        return result;
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tea6420",
-        },
-        .id     = I2C_DRIVERID_TEA6420,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
+static const struct i2c_device_id tea6420_id[] = {
+        { "tea6420", 0 },
+        { }
 };
+MODULE_DEVICE_TABLE(i2c, tea6420_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tea6420",
-        .driver = &driver,
+        .driverid = I2C_DRIVERID_TEA6420,
+        .command = tea6420_command,
+        .probe = tea6420_probe,
+        .legacy_probe = tea6420_legacy_probe,
+        .id_table = tea6420_id,
 };
-
-static int __init this_module_init(void)
-{
-        return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-        i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tea6420 driver");
-MODULE_LICENSE("GPL");