V4L/DVB (6463): upd64031a: convert to bus-based I2C API

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

1 files changed, 12 insertions, 57 deletions

diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 0b2a961efd22..b060ce34071c 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -28,6 +28,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include <media/upd64031a.h>
 
 // --------------------- read registers functions define -----------------------
@@ -193,32 +194,18 @@ static int upd64031a_command(struct i2c_client *client, unsigned int cmd, void *
 
 /* i2c implementation */
 
-static struct i2c_driver i2c_driver;
-
-static int upd64031a_attach(struct i2c_adapter *adapter, int address, int kind)
+static int upd64031a_probe(struct i2c_client *client)
 {
-        struct i2c_client *client;
         struct upd64031a_state *state;
         int i;
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return 0;
 
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL) {
-                return -ENOMEM;
-        }
-
-        client->addr = address;
-        client->adapter = adapter;
-        client->driver = &i2c_driver;
-        snprintf(client->name, sizeof(client->name) - 1, "uPD64031A");
-
-        v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
+        v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name);
 
         state = kmalloc(sizeof(struct upd64031a_state), GFP_KERNEL);
         if (state == NULL) {
-                kfree(client);
                 return -ENOMEM;
         }
         i2c_set_clientdata(client, state);
@@ -229,54 +216,22 @@ static int upd64031a_attach(struct i2c_adapter *adapter, int address, int kind)
         for (i = 0; i < TOT_REGS; i++) {
                 upd64031a_write(client, i, state->regs[i]);
         }
-
-        i2c_attach_client(client);
-
         return 0;
 }
 
-static int upd64031a_probe(struct i2c_adapter *adapter)
+static int upd64031a_remove(struct i2c_client *client)
 {
-        if (adapter->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adapter, &addr_data, upd64031a_attach);
-        return 0;
-}
-
-static int upd64031a_detach(struct i2c_client *client)
-{
-        int err;
-
-        err = i2c_detach_client(client);
-        if (err)
-                return err;
-
-        kfree(client);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 
-/* i2c implementation */
-static struct i2c_driver i2c_driver = {
-        .driver = {
-                .name = "upd64031a",
-        },
-        .id = I2C_DRIVERID_UPD64031A,
-        .attach_adapter = upd64031a_probe,
-        .detach_client  = upd64031a_detach,
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "upd64031a",
+        .driverid = I2C_DRIVERID_UPD64031A,
         .command = upd64031a_command,
+        .probe = upd64031a_probe,
+        .remove = upd64031a_remove,
 };
-
-
-static int __init upd64031a_init_module(void)
-{
-        return i2c_add_driver(&i2c_driver);
-}
-
-static void __exit upd64031a_exit_module(void)
-{
-        i2c_del_driver(&i2c_driver);
-}
-
-module_init(upd64031a_init_module);
-module_exit(upd64031a_exit_module);