Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  go7007: Convert to the new i2c device binding model

13 files changed, 176 insertions, 418 deletions

diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c
index f47c0ce2849a..77b1e769ac92 100644
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/go7007/go7007-driver.c
@@ -191,8 +191,10 @@ int go7007_reset_encoder(struct go7007 *go)
 /*
  * Attempt to instantiate an I2C client by ID, probably loading a module.
  */
-static int init_i2c_module(struct i2c_adapter *adapter, int id, int addr)
+static int init_i2c_module(struct i2c_adapter *adapter, const char *type,
+                           int id, int addr)
 {
+        struct i2c_board_info info;
         char *modname;
 
         switch (id) {
@@ -226,7 +228,11 @@ static int init_i2c_module(struct i2c_adapter *adapter, int id, int addr)
         }
         if (modname != NULL)
                 request_module(modname);
-        if (wis_i2c_probe_device(adapter, id, addr) == 1)
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        info.addr = addr;
+        strlcpy(info.type, type, I2C_NAME_SIZE);
+        if (!i2c_new_device(adapter, &info))
                 return 0;
         if (modname != NULL)
                 printk(KERN_INFO
@@ -266,6 +272,7 @@ int go7007_register_encoder(struct go7007 *go)
         if (go->i2c_adapter_online) {
                 for (i = 0; i < go->board_info->num_i2c_devs; ++i)
                         init_i2c_module(&go->i2c_adapter,
+                                        go->board_info->i2c_devs[i].type,
                                         go->board_info->i2c_devs[i].id,
                                         go->board_info->i2c_devs[i].addr);
                 if (go->board_id == GO7007_BOARDID_ADLINK_MPG24)
diff --git a/drivers/staging/go7007/go7007-i2c.c b/drivers/staging/go7007/go7007-i2c.c
index cd55b76eabc7..c82867fdd28d 100644
--- a/drivers/staging/go7007/go7007-i2c.c
+++ b/drivers/staging/go7007/go7007-i2c.c
@@ -31,87 +31,6 @@
 #include "go7007-priv.h"
 #include "wis-i2c.h"
 
-/************** Registration interface for I2C client drivers **************/
-
-/* Since there's no way to auto-probe the I2C devices connected to the I2C
- * bus on the go7007, we have this silly little registration system that
- * client drivers can use to register their I2C driver ID and their
- * detect_client function (the one that's normally passed to i2c_probe).
- *
- * When a new go7007 device is connected, we can look up in a board info
- * table by the USB or PCI vendor/product/revision ID to determine
- * which I2C client module to load.  The client driver module will register
- * itself here, and then we can call the registered detect_client function
- * to force-load a new client at the address listed in the board info table.
- *
- * Really the I2C subsystem should have a way to force-load I2C client
- * drivers when we have a priori knowledge of what's on the bus, especially
- * since the existing I2C auto-probe mechanism is so hokey, but we'll use
- * our own mechanism for the time being. */
-
-struct wis_i2c_client_driver {
-        unsigned int id;
-        found_proc found_proc;
-        struct list_head list;
-};
-
-static LIST_HEAD(i2c_client_drivers);
-static DECLARE_MUTEX(i2c_client_driver_list_lock);
-
-/* Client drivers register here by their I2C driver ID */
-int wis_i2c_add_driver(unsigned int id, found_proc found_proc)
-{
-        struct wis_i2c_client_driver *driver;
-
-        driver = kmalloc(sizeof(struct wis_i2c_client_driver), GFP_KERNEL);
-        if (driver == NULL)
-                return -ENOMEM;
-        driver->id = id;
-        driver->found_proc = found_proc;
-
-        down(&i2c_client_driver_list_lock);
-        list_add_tail(&driver->list, &i2c_client_drivers);
-        up(&i2c_client_driver_list_lock);
-
-        return 0;
-}
-EXPORT_SYMBOL(wis_i2c_add_driver);
-
-void wis_i2c_del_driver(found_proc found_proc)
-{
-        struct wis_i2c_client_driver *driver, *next;
-
-        down(&i2c_client_driver_list_lock);
-        list_for_each_entry_safe(driver, next, &i2c_client_drivers, list)
-                if (driver->found_proc == found_proc) {
-                        list_del(&driver->list);
-                        kfree(driver);
-                }
-        up(&i2c_client_driver_list_lock);
-}
-EXPORT_SYMBOL(wis_i2c_del_driver);
-
-/* The main go7007 driver calls this to instantiate a client by driver
- * ID and bus address, which are both stored in the board info table */
-int wis_i2c_probe_device(struct i2c_adapter *adapter,
-                                unsigned int id, int addr)
-{
-        struct wis_i2c_client_driver *driver;
-        int found = 0;
-
-        if (addr < 0 || addr > 0x7f)
-                return -1;
-        down(&i2c_client_driver_list_lock);
-        list_for_each_entry(driver, &i2c_client_drivers, list)
-                if (driver->id == id) {
-                        if (driver->found_proc(adapter, addr, 0) == 0)
-                                found = 1;
-                        break;
-                }
-        up(&i2c_client_driver_list_lock);
-        return found;
-}
-
 /********************* Driver for on-board I2C adapter *********************/
 
 /* #define GO7007_I2C_DEBUG */
@@ -287,9 +206,7 @@ static struct i2c_algorithm go7007_algo = {
 
 static struct i2c_adapter go7007_adap_templ = {
         .owner                  = THIS_MODULE,
-        .class                  = I2C_CLASS_TV_ANALOG,
         .name                   = "WIS GO7007SB",
-        .id                     = I2C_ALGO_GO7007,
         .algo                   = &go7007_algo,
 };
 
diff --git a/drivers/staging/go7007/go7007-priv.h b/drivers/staging/go7007/go7007-priv.h
index 372f1f1c09b2..178d18119faa 100644
--- a/drivers/staging/go7007/go7007-priv.h
+++ b/drivers/staging/go7007/go7007-priv.h
@@ -87,6 +87,7 @@ struct go7007_board_info {
         int audio_main_div;
         int num_i2c_devs;
         struct {
+                const char *type;
                 int id;
                 int addr;
         } i2c_devs[4];
diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c
index 83eec920c7d3..aa4a9e0b9954 100644
--- a/drivers/staging/go7007/go7007-usb.c
+++ b/drivers/staging/go7007/go7007-usb.c
@@ -91,6 +91,7 @@ static struct go7007_usb_board board_matrix_ii = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_saa7115",
                                 .id     = I2C_DRIVERID_WIS_SAA7115,
                                 .addr   = 0x20,
                         },
@@ -127,6 +128,7 @@ static struct go7007_usb_board board_matrix_reload = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_saa7113",
                                 .id     = I2C_DRIVERID_WIS_SAA7113,
                                 .addr   = 0x25,
                         },
@@ -164,6 +166,7 @@ static struct go7007_usb_board board_star_trek = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_saa7115",
                                 .id     = I2C_DRIVERID_WIS_SAA7115,
                                 .addr   = 0x20,
                         },
@@ -209,14 +212,17 @@ static struct go7007_usb_board board_px_tv402u = {
                 .num_i2c_devs    = 3,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_saa7115",
                                 .id     = I2C_DRIVERID_WIS_SAA7115,
                                 .addr   = 0x20,
                         },
                         {
+                                .type   = "wis_uda1342",
                                 .id     = I2C_DRIVERID_WIS_UDA1342,
                                 .addr   = 0x1a,
                         },
                         {
+                                .type   = "wis_sony_tuner",
                                 .id     = I2C_DRIVERID_WIS_SONY_TUNER,
                                 .addr   = 0x60,
                         },
@@ -264,6 +270,7 @@ static struct go7007_usb_board board_xmen = {
                 .num_i2c_devs     = 1,
                 .i2c_devs         = {
                         {
+                                .type   = "wis_ov7640",
                                 .id     = I2C_DRIVERID_WIS_OV7640,
                                 .addr   = 0x21,
                         },
@@ -296,6 +303,7 @@ static struct go7007_usb_board board_matrix_revolution = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_tw9903",
                                 .id     = I2C_DRIVERID_WIS_TW9903,
                                 .addr   = 0x44,
                         },
@@ -385,6 +393,7 @@ static struct go7007_usb_board board_adlink_mpg24 = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "wis_twTW2804",
                                 .id     = I2C_DRIVERID_WIS_TW2804,
                                 .addr   = 0x00, /* yes, really */
                         },
@@ -415,8 +424,9 @@ static struct go7007_usb_board board_sensoray_2250 = {
                 .num_i2c_devs    = 1,
                 .i2c_devs        = {
                         {
+                                .type   = "s2250_board",
                                 .id     = I2C_DRIVERID_S2250,
-                                .addr   = 0x34,
+                                .addr   = 0x43,
                         },
                 },
                 .num_inputs      = 2,
@@ -943,9 +953,7 @@ static struct i2c_algorithm go7007_usb_algo = {
 
 static struct i2c_adapter go7007_usb_adap_templ = {
         .owner                  = THIS_MODULE,
-        .class                  = I2C_CLASS_TV_ANALOG,
         .name                   = "WIS GO7007SB EZ-USB",
-        .id                     = I2C_ALGO_GO7007_USB,
         .algo                   = &go7007_usb_algo,
 };
 
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index d333ea2cd774..1706fbf06847 100644
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/go7007/s2250-board.c
@@ -28,7 +28,6 @@ extern int s2250loader_init(void);
 extern void s2250loader_cleanup(void);
 
 #define TLV320_ADDRESS      0x34
-#define S2250_VIDDEC        0x86
 #define VPX322_ADDR_ANALOGCONTROL1      0x02
 #define VPX322_ADDR_BRIGHTNESS0         0x0127
 #define VPX322_ADDR_BRIGHTNESS1         0x0131
@@ -123,6 +122,7 @@ struct s2250 {
         int hue;
         int reg12b_val;
         int audio_input;
+        struct i2c_client *audio;
 };
 
 /* from go7007-usb.c which is Copyright (C) 2005-2006 Micronas USA Inc.*/
@@ -452,16 +452,15 @@ static int s2250_command(struct i2c_client *client,
         {
                 struct v4l2_audio *audio = arg;
 
-                client->addr = TLV320_ADDRESS;
                 switch (audio->index) {
                 case 0:
-                        write_reg(client, 0x08, 0x02); /* Line In */
+                        write_reg(dec->audio, 0x08, 0x02); /* Line In */
                         break;
                 case 1:
-                        write_reg(client, 0x08, 0x04); /* Mic */
+                        write_reg(dec->audio, 0x08, 0x04); /* Mic */
                         break;
                 case 2:
-                        write_reg(client, 0x08, 0x05); /* Mic Boost */
+                        write_reg(dec->audio, 0x08, 0x05); /* Mic Boost */
                         break;
                 default:
                         return -EINVAL;
@@ -477,31 +476,23 @@ static int s2250_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver s2250_driver;
-
-static struct i2c_client s2250_client_templ = {
-        .name           = "Sensoray 2250",
-        .driver         = &s2250_driver,
-};
-
-static int s2250_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int s2250_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_client *audio;
+        struct i2c_adapter *adapter = client->adapter;
         struct s2250 *dec;
         u8 *data;
         struct go7007 *go = i2c_get_adapdata(adapter);
         struct go7007_usb *usb = go->hpi_context;
 
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
+        audio = i2c_new_dummy(adapter, TLV320_ADDRESS >> 1);
+        if (audio == NULL)
                 return -ENOMEM;
-        memcpy(client, &s2250_client_templ,
-               sizeof(s2250_client_templ));
-        client->adapter = adapter;
 
         dec = kmalloc(sizeof(struct s2250), GFP_KERNEL);
         if (dec == NULL) {
-                kfree(client);
+                i2c_unregister_device(audio);
                 return -ENOMEM;
         }
 
@@ -510,7 +501,7 @@ static int s2250_detect(struct i2c_adapter *adapter, int addr, int kind)
         dec->contrast = 50;
         dec->saturation = 50;
         dec->hue = 0;
-        client->addr = TLV320_ADDRESS;
+        dec->audio = audio;
         i2c_set_clientdata(client, dec);
 
         printk(KERN_DEBUG
@@ -518,28 +509,25 @@ static int s2250_detect(struct i2c_adapter *adapter, int addr, int kind)
                adapter->name);
 
         /* initialize the audio */
-        client->addr = TLV320_ADDRESS;
-        if (write_regs(client, aud_regs) < 0) {
+        if (write_regs(audio, aud_regs) < 0) {
                 printk(KERN_ERR
                        "s2250: error initializing audio\n");
-                kfree(client);
+                i2c_unregister_device(audio);
                 kfree(dec);
                 return 0;
         }
-        client->addr = S2250_VIDDEC;
-        i2c_set_clientdata(client, dec);
 
         if (write_regs(client, vid_regs) < 0) {
                 printk(KERN_ERR
                        "s2250: error initializing decoder\n");
-                kfree(client);
+                i2c_unregister_device(audio);
                 kfree(dec);
                 return 0;
         }
         if (write_regs_fp(client, vid_regs_fp) < 0) {
                 printk(KERN_ERR
                        "s2250: error initializing decoder\n");
-                kfree(client);
+                i2c_unregister_device(audio);
                 kfree(dec);
                 return 0;
         }
@@ -575,32 +563,33 @@ static int s2250_detect(struct i2c_adapter *adapter, int addr, int kind)
                 up(&usb->i2c_lock);
         }
 
-        i2c_attach_client(client);
         printk("s2250: initialized successfully\n");
         return 0;
 }
 
-static int s2250_detach(struct i2c_client *client)
+static int s2250_remove(struct i2c_client *client)
 {
         struct s2250 *dec = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
-        kfree(client);
+        i2c_set_clientdata(client, NULL);
+        i2c_unregister_device(dec->audio);
         kfree(dec);
         return 0;
 }
 
+static struct i2c_device_id s2250_id[] = {
+        { "s2250_board", 0 },
+        { }
+};
+
 static struct i2c_driver s2250_driver = {
         .driver = {
                 .name   = "Sensoray 2250 board driver",
         },
-        .id             = I2C_DRIVERID_S2250,
-        .detach_client  = s2250_detach,
+        .probe          = s2250_probe,
+        .remove         = s2250_remove,
         .command        = s2250_command,
+        .id_table       = s2250_id,
 };
 
 static int __init s2250_init(void)
@@ -613,13 +602,13 @@ static int __init s2250_init(void)
 
         r = i2c_add_driver(&s2250_driver);
         if (r < 0)
-                return r;
-        return wis_i2c_add_driver(s2250_driver.id, s2250_detect);
+                s2250loader_cleanup();
+
+        return r;
 }
 
 static void __exit s2250_cleanup(void)
 {
-        wis_i2c_del_driver(s2250_detect);
         i2c_del_driver(&s2250_driver);
 
         s2250loader_cleanup();
diff --git a/drivers/staging/go7007/wis-i2c.h b/drivers/staging/go7007/wis-i2c.h
index 431f41dd3966..3c2b9be455df 100644
--- a/drivers/staging/go7007/wis-i2c.h
+++ b/drivers/staging/go7007/wis-i2c.h
@@ -24,21 +24,12 @@
 #define I2C_DRIVERID_WIS_OV7640         0xf0f5
 #define I2C_DRIVERID_WIS_TW2804         0xf0f6
 #define I2C_DRIVERID_S2250              0xf0f7
-#define I2C_ALGO_GO7007                 0xf00000
-#define I2C_ALGO_GO7007_USB             0xf10000
 
 /* Flag to indicate that the client needs to be accessed with SCCB semantics */
 /* We re-use the I2C_M_TEN value so the flag passes through the masks in the
  * core I2C code.  Major kludge, but the I2C layer ain't exactly flexible. */
 #define I2C_CLIENT_SCCB                 0x10
 
-typedef int (*found_proc) (struct i2c_adapter *, int, int);
-int wis_i2c_add_driver(unsigned int id, found_proc found_proc);
-void wis_i2c_del_driver(found_proc found_proc);
-
-int wis_i2c_probe_device(struct i2c_adapter *adapter,
-                                unsigned int id, int addr);
-
 /* Definitions for new video decoder commands */
 
 struct video_decoder_resolution {
diff --git a/drivers/staging/go7007/wis-ov7640.c b/drivers/staging/go7007/wis-ov7640.c
index 2f9efca04606..04d6d3a498a3 100644
--- a/drivers/staging/go7007/wis-ov7640.c
+++ b/drivers/staging/go7007/wis-ov7640.c
@@ -50,76 +50,54 @@ static int write_regs(struct i2c_client *client, u8 *regs)
         return 0;
 }
 
-static struct i2c_driver wis_ov7640_driver;
-
-static struct i2c_client wis_ov7640_client_templ = {
-        .name           = "OV7640 (WIS)",
-        .driver         = &wis_ov7640_driver,
-};
-
-static int wis_ov7640_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_ov7640_probe(struct i2c_client *client,
+                            const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_ov7640_client_templ,
-                        sizeof(wis_ov7640_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
+
         client->flags = I2C_CLIENT_SCCB;
 
         printk(KERN_DEBUG
                 "wis-ov7640: initializing OV7640 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
         if (write_regs(client, initial_registers) < 0) {
                 printk(KERN_ERR "wis-ov7640: error initializing OV7640\n");
-                kfree(client);
-                return 0;
+                return -ENODEV;
         }
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_ov7640_detach(struct i2c_client *client)
+static int wis_ov7640_remove(struct i2c_client *client)
 {
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
-
-        kfree(client);
         return 0;
 }
 
+static struct i2c_device_id wis_ov7640_id[] = {
+        { "wis_ov7640", 0 },
+        { }
+};
+
 static struct i2c_driver wis_ov7640_driver = {
         .driver = {
                 .name   = "WIS OV7640 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_OV7640,
-        .detach_client  = wis_ov7640_detach,
+        .probe          = wis_ov7640_probe,
+        .remove         = wis_ov7640_remove,
+        .id_table       = wis_ov7640_id,
 };
 
 static int __init wis_ov7640_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_ov7640_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_ov7640_driver.id, wis_ov7640_detect);
+        return i2c_add_driver(&wis_ov7640_driver);
 }
 
 static void __exit wis_ov7640_cleanup(void)
 {
-        wis_i2c_del_driver(wis_ov7640_detect);
         i2c_del_driver(&wis_ov7640_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c
index 11689723945e..9ab893bd204e 100644
--- a/drivers/staging/go7007/wis-saa7113.c
+++ b/drivers/staging/go7007/wis-saa7113.c
@@ -261,34 +261,19 @@ static int wis_saa7113_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver wis_saa7113_driver;
-
-static struct i2c_client wis_saa7113_client_templ = {
-        .name           = "SAA7113 (WIS)",
-        .driver         = &wis_saa7113_driver,
-};
-
-static int wis_saa7113_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_saa7113_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
         struct wis_saa7113 *dec;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_saa7113_client_templ,
-                        sizeof(wis_saa7113_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         dec = kmalloc(sizeof(struct wis_saa7113), GFP_KERNEL);
-        if (dec == NULL) {
-                kfree(client);
+        if (dec == NULL)
                 return -ENOMEM;
-        }
+
         dec->norm = V4L2_STD_NTSC;
         dec->brightness = 128;
         dec->contrast = 71;
@@ -298,56 +283,49 @@ static int wis_saa7113_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         printk(KERN_DEBUG
                 "wis-saa7113: initializing SAA7113 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
         if (write_regs(client, initial_registers) < 0) {
                 printk(KERN_ERR
                         "wis-saa7113: error initializing SAA7113\n");
-                kfree(client);
                 kfree(dec);
-                return 0;
+                return -ENODEV;
         }
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_saa7113_detach(struct i2c_client *client)
+static int wis_saa7113_remove(struct i2c_client *client)
 {
         struct wis_saa7113 *dec = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
-        kfree(client);
+        i2c_set_clientdata(client, NULL);
         kfree(dec);
         return 0;
 }
 
+static struct i2c_device_id wis_saa7113_id[] = {
+        { "wis_saa7113", 0 },
+        { }
+};
+
 static struct i2c_driver wis_saa7113_driver = {
         .driver = {
                 .name   = "WIS SAA7113 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_SAA7113,
-        .detach_client  = wis_saa7113_detach,
+        .probe          = wis_saa7113_probe,
+        .remove         = wis_saa7113_remove,
         .command        = wis_saa7113_command,
+        .id_table       = wis_saa7113_id,
 };
 
 static int __init wis_saa7113_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_saa7113_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_saa7113_driver.id, wis_saa7113_detect);
+        return i2c_add_driver(&wis_saa7113_driver);
 }
 
 static void __exit wis_saa7113_cleanup(void)
 {
-        wis_i2c_del_driver(wis_saa7113_detect);
         i2c_del_driver(&wis_saa7113_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/go7007/wis-saa7115.c
index 59417a7174d7..8687ad2de761 100644
--- a/drivers/staging/go7007/wis-saa7115.c
+++ b/drivers/staging/go7007/wis-saa7115.c
@@ -394,34 +394,19 @@ static int wis_saa7115_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver wis_saa7115_driver;
-
-static struct i2c_client wis_saa7115_client_templ = {
-        .name           = "SAA7115 (WIS)",
-        .driver         = &wis_saa7115_driver,
-};
-
-static int wis_saa7115_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_saa7115_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
         struct wis_saa7115 *dec;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_saa7115_client_templ,
-                        sizeof(wis_saa7115_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         dec = kmalloc(sizeof(struct wis_saa7115), GFP_KERNEL);
-        if (dec == NULL) {
-                kfree(client);
+        if (dec == NULL)
                 return -ENOMEM;
-        }
+
         dec->norm = V4L2_STD_NTSC;
         dec->brightness = 128;
         dec->contrast = 64;
@@ -431,56 +416,49 @@ static int wis_saa7115_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         printk(KERN_DEBUG
                 "wis-saa7115: initializing SAA7115 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
         if (write_regs(client, initial_registers) < 0) {
                 printk(KERN_ERR
                         "wis-saa7115: error initializing SAA7115\n");
-                kfree(client);
                 kfree(dec);
-                return 0;
+                return -ENODEV;
         }
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_saa7115_detach(struct i2c_client *client)
+static int wis_saa7115_remove(struct i2c_client *client)
 {
         struct wis_saa7115 *dec = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
-        kfree(client);
+        i2c_set_clientdata(client, NULL);
         kfree(dec);
         return 0;
 }
 
+static struct i2c_device_id wis_saa7115_id[] = {
+        { "wis_saa7115", 0 },
+        { }
+};
+
 static struct i2c_driver wis_saa7115_driver = {
         .driver = {
                 .name   = "WIS SAA7115 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_SAA7115,
-        .detach_client  = wis_saa7115_detach,
+        .probe          = wis_saa7115_probe,
+        .remove         = wis_saa7115_remove,
         .command        = wis_saa7115_command,
+        .id_table       = wis_saa7115_id,
 };
 
 static int __init wis_saa7115_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_saa7115_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_saa7115_driver.id, wis_saa7115_detect);
+        return i2c_add_driver(&wis_saa7115_driver);
 }
 
 static void __exit wis_saa7115_cleanup(void)
 {
-        wis_i2c_del_driver(wis_saa7115_detect);
         i2c_del_driver(&wis_saa7115_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c
index 0a7eeef7c008..c965c601ac90 100644
--- a/drivers/staging/go7007/wis-sony-tuner.c
+++ b/drivers/staging/go7007/wis-sony-tuner.c
@@ -653,35 +653,19 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static struct i2c_driver wis_sony_tuner_driver;
-
-static struct i2c_client wis_sony_tuner_client_templ = {
-        .name           = "Sony TV Tuner (WIS)",
-        .driver         = &wis_sony_tuner_driver,
-};
-
-static int wis_sony_tuner_detect(struct i2c_adapter *adapter,
-                                        int addr, int kind)
+static int wis_sony_tuner_probe(struct i2c_client *client,
+                                const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
         struct wis_sony_tuner *t;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_sony_tuner_client_templ,
-                        sizeof(wis_sony_tuner_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         t = kmalloc(sizeof(struct wis_sony_tuner), GFP_KERNEL);
-        if (t == NULL) {
-                kfree(client);
+        if (t == NULL)
                 return -ENOMEM;
-        }
+
         t->type = -1;
         t->freq = 0;
         t->mpxmode = 0;
@@ -690,50 +674,42 @@ static int wis_sony_tuner_detect(struct i2c_adapter *adapter,
 
         printk(KERN_DEBUG
                 "wis-sony-tuner: initializing tuner at address %d on %s\n",
-                addr, adapter->name);
-
-        i2c_attach_client(client);
+                client->addr, adapter->name);
 
         return 0;
 }
 
-static int wis_sony_tuner_detach(struct i2c_client *client)
+static int wis_sony_tuner_remove(struct i2c_client *client)
 {
         struct wis_sony_tuner *t = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
+        i2c_set_clientdata(client, NULL);
         kfree(t);
-        kfree(client);
         return 0;
 }
 
+static struct i2c_device_id wis_sony_tuner_id[] = {
+        { "wis_sony_tuner", 0 },
+        { }
+};
+
 static struct i2c_driver wis_sony_tuner_driver = {
         .driver = {
                 .name   = "WIS Sony TV Tuner I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_SONY_TUNER,
-        .detach_client  = wis_sony_tuner_detach,
+        .probe          = wis_sony_tuner_probe,
+        .remove         = wis_sony_tuner_remove,
         .command        = tuner_command,
+        .id_table       = wis_sony_tuner_id,
 };
 
 static int __init wis_sony_tuner_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_sony_tuner_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_sony_tuner_driver.id,
-                                        wis_sony_tuner_detect);
+        return i2c_add_driver(&wis_sony_tuner_driver);
 }
 
 static void __exit wis_sony_tuner_cleanup(void)
 {
-        wis_i2c_del_driver(wis_sony_tuner_detect);
         i2c_del_driver(&wis_sony_tuner_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/go7007/wis-tw2804.c
index 57b8f2b1caa3..e15794a2a0ae 100644
--- a/drivers/staging/go7007/wis-tw2804.c
+++ b/drivers/staging/go7007/wis-tw2804.c
@@ -291,34 +291,19 @@ static int wis_tw2804_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver wis_tw2804_driver;
-
-static struct i2c_client wis_tw2804_client_templ = {
-        .name           = "TW2804 (WIS)",
-        .driver         = &wis_tw2804_driver,
-};
-
-static int wis_tw2804_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_tw2804_probe(struct i2c_client *client,
+                            const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
         struct wis_tw2804 *dec;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_tw2804_client_templ,
-                        sizeof(wis_tw2804_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         dec = kmalloc(sizeof(struct wis_tw2804), GFP_KERNEL);
-        if (dec == NULL) {
-                kfree(client);
+        if (dec == NULL)
                 return -ENOMEM;
-        }
+
         dec->channel = -1;
         dec->norm = V4L2_STD_NTSC;
         dec->brightness = 128;
@@ -328,48 +313,42 @@ static int wis_tw2804_detect(struct i2c_adapter *adapter, int addr, int kind)
         i2c_set_clientdata(client, dec);
 
         printk(KERN_DEBUG "wis-tw2804: creating TW2804 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_tw2804_detach(struct i2c_client *client)
+static int wis_tw2804_remove(struct i2c_client *client)
 {
         struct wis_tw2804 *dec = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
-        kfree(client);
+        i2c_set_clientdata(client, NULL);
         kfree(dec);
         return 0;
 }
 
+static struct i2c_device_id wis_tw2804_id[] = {
+        { "wis_tw2804", 0 },
+        { }
+};
+
 static struct i2c_driver wis_tw2804_driver = {
         .driver = {
                 .name   = "WIS TW2804 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_TW2804,
-        .detach_client  = wis_tw2804_detach,
+        .probe          = wis_tw2804_probe,
+        .remove         = wis_tw2804_remove,
         .command        = wis_tw2804_command,
+        .id_table       = wis_tw2804_id,
 };
 
 static int __init wis_tw2804_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_tw2804_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_tw2804_driver.id, wis_tw2804_detect);
+        return i2c_add_driver(&wis_tw2804_driver);
 }
 
 static void __exit wis_tw2804_cleanup(void)
 {
-        wis_i2c_del_driver(wis_tw2804_detect);
         i2c_del_driver(&wis_tw2804_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c
index 40627b282cb4..6c3427bb6f4c 100644
--- a/drivers/staging/go7007/wis-tw9903.c
+++ b/drivers/staging/go7007/wis-tw9903.c
@@ -267,34 +267,19 @@ static int wis_tw9903_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver wis_tw9903_driver;
-
-static struct i2c_client wis_tw9903_client_templ = {
-        .name           = "TW9903 (WIS)",
-        .driver         = &wis_tw9903_driver,
-};
-
-static int wis_tw9903_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_tw9903_probe(struct i2c_client *client,
+                            const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
         struct wis_tw9903 *dec;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_tw9903_client_templ,
-                        sizeof(wis_tw9903_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         dec = kmalloc(sizeof(struct wis_tw9903), GFP_KERNEL);
-        if (dec == NULL) {
-                kfree(client);
+        if (dec == NULL)
                 return -ENOMEM;
-        }
+
         dec->norm = V4L2_STD_NTSC;
         dec->brightness = 0;
         dec->contrast = 0x60;
@@ -303,55 +288,48 @@ static int wis_tw9903_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         printk(KERN_DEBUG
                 "wis-tw9903: initializing TW9903 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
         if (write_regs(client, initial_registers) < 0) {
                 printk(KERN_ERR "wis-tw9903: error initializing TW9903\n");
-                kfree(client);
                 kfree(dec);
-                return 0;
+                return -ENODEV;
         }
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_tw9903_detach(struct i2c_client *client)
+static int wis_tw9903_remove(struct i2c_client *client)
 {
         struct wis_tw9903 *dec = i2c_get_clientdata(client);
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
 
-        kfree(client);
+        i2c_set_clientdata(client, NULL);
         kfree(dec);
         return 0;
 }
 
+static struct i2c_device_id wis_tw9903_id[] = {
+        { "wis_tw9903", 0 },
+        { }
+};
+
 static struct i2c_driver wis_tw9903_driver = {
         .driver = {
                 .name   = "WIS TW9903 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_TW9903,
-        .detach_client  = wis_tw9903_detach,
+        .probe          = wis_tw9903_probe,
+        .remove         = wis_tw9903_remove,
         .command        = wis_tw9903_command,
+        .id_table       = wis_tw9903_id,
 };
 
 static int __init wis_tw9903_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_tw9903_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_tw9903_driver.id, wis_tw9903_detect);
+        return i2c_add_driver(&wis_tw9903_driver);
 }
 
 static void __exit wis_tw9903_cleanup(void)
 {
-        wis_i2c_del_driver(wis_tw9903_detect);
         i2c_del_driver(&wis_tw9903_driver);
 }
 
diff --git a/drivers/staging/go7007/wis-uda1342.c b/drivers/staging/go7007/wis-uda1342.c
index 555645c0cc1a..739c7ae8913f 100644
--- a/drivers/staging/go7007/wis-uda1342.c
+++ b/drivers/staging/go7007/wis-uda1342.c
@@ -59,73 +59,51 @@ static int wis_uda1342_command(struct i2c_client *client,
         return 0;
 }
 
-static struct i2c_driver wis_uda1342_driver;
-
-static struct i2c_client wis_uda1342_client_templ = {
-        .name           = "UDA1342 (WIS)",
-        .driver         = &wis_uda1342_driver,
-};
-
-static int wis_uda1342_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int wis_uda1342_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
+        struct i2c_adapter *adapter = client->adapter;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
-                return 0;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &wis_uda1342_client_templ,
-                        sizeof(wis_uda1342_client_templ));
-        client->adapter = adapter;
-        client->addr = addr;
+                return -ENODEV;
 
         printk(KERN_DEBUG
                 "wis-uda1342: initializing UDA1342 at address %d on %s\n",
-                addr, adapter->name);
+                client->addr, adapter->name);
 
         write_reg(client, 0x00, 0x8000); /* reset registers */
         write_reg(client, 0x00, 0x1241); /* select input 1 */
 
-        i2c_attach_client(client);
         return 0;
 }
 
-static int wis_uda1342_detach(struct i2c_client *client)
+static int wis_uda1342_remove(struct i2c_client *client)
 {
-        int r;
-
-        r = i2c_detach_client(client);
-        if (r < 0)
-                return r;
-
-        kfree(client);
         return 0;
 }
 
+static struct i2c_device_id wis_uda1342_id[] = {
+        { "wis_uda1342", 0 },
+        { }
+};
+
 static struct i2c_driver wis_uda1342_driver = {
         .driver = {
                 .name   = "WIS UDA1342 I2C driver",
         },
-        .id             = I2C_DRIVERID_WIS_UDA1342,
-        .detach_client  = wis_uda1342_detach,
+        .probe          = wis_uda1342_probe,
+        .remove         = wis_uda1342_remove,
         .command        = wis_uda1342_command,
+        .id_table       = wis_uda1342_id,
 };
 
 static int __init wis_uda1342_init(void)
 {
-        int r;
-
-        r = i2c_add_driver(&wis_uda1342_driver);
-        if (r < 0)
-                return r;
-        return wis_i2c_add_driver(wis_uda1342_driver.id, wis_uda1342_detect);
+        return i2c_add_driver(&wis_uda1342_driver);
 }
 
 static void __exit wis_uda1342_cleanup(void)
 {
-        wis_i2c_del_driver(wis_uda1342_detect);
         i2c_del_driver(&wis_uda1342_driver);
 }