Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  therm_windtunnel: Convert to a new-style i2c driver
  therm_adt746x: Convert to a new-style i2c driver
  windfarm: Convert to new-style i2c drivers
  therm_pm72: Convert to a new-style i2c driver
  i2c-viapro: Add new PCI device ID for VX855
  i2c/chips: Move max6875 to drivers/misc/eeprom
  i2c: Do not give adapters a default parent
  i2c: Do not probe for TV chips on Voodoo3 adapters
  i2c: Retry automatically on arbitration loss
  i2c: Remove void casts

1 files changed, 42 insertions, 42 deletions

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 0ddf9044948a..fde377c60cca 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -72,7 +72,7 @@ MODULE_PARM_DESC(verbose,"Verbose log operations "
                  "(default 0)");
 
 struct thermostat {
-        struct i2c_client       clt;
+        struct i2c_client       *clt;
         u8                      temps[3];
         u8                      cached_temp[3];
         u8                      initial_limits[3];
@@ -87,9 +87,6 @@ static struct of_device * of_dev;
 static struct thermostat* thermostat;
 static struct task_struct *thread_therm = NULL;
 
-static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
-                                 int busno);
-
 static void write_both_fan_speed(struct thermostat *th, int speed);
 static void write_fan_speed(struct thermostat *th, int speed, int fan);
 
@@ -101,7 +98,7 @@ write_reg(struct thermostat* th, int reg, u8 data)
         
         tmp[0] = reg;
         tmp[1] = data;
-        rc = i2c_master_send(&th->clt, (const char *)tmp, 2);
+        rc = i2c_master_send(th->clt, (const char *)tmp, 2);
         if (rc < 0)
                 return rc;
         if (rc != 2)
@@ -116,12 +113,12 @@ read_reg(struct thermostat* th, int reg)
         int rc;
 
         reg_addr = (u8)reg;
-        rc = i2c_master_send(&th->clt, &reg_addr, 1);
+        rc = i2c_master_send(th->clt, &reg_addr, 1);
         if (rc < 0)
                 return rc;
         if (rc != 1)
                 return -ENODEV;
-        rc = i2c_master_recv(&th->clt, (char *)&data, 1);
+        rc = i2c_master_recv(th->clt, (char *)&data, 1);
         if (rc < 0)
                 return rc;
         return data;
@@ -131,26 +128,36 @@ static int
 attach_thermostat(struct i2c_adapter *adapter)
 {
         unsigned long bus_no;
+        struct i2c_board_info info;
+        struct i2c_client *client;
 
         if (strncmp(adapter->name, "uni-n", 5))
                 return -ENODEV;
         bus_no = simple_strtoul(adapter->name + 6, NULL, 10);
         if (bus_no != therm_bus)
                 return -ENODEV;
-        return attach_one_thermostat(adapter, therm_address, bus_no);
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "therm_adt746x", I2C_NAME_SIZE);
+        info.addr = therm_address;
+        client = i2c_new_device(adapter, &info);
+        if (!client)
+                return -ENODEV;
+
+        /*
+         * Let i2c-core delete that device on driver removal.
+         * This is safe because i2c-core holds the core_lock mutex for us.
+         */
+        list_add_tail(&client->detected, &client->driver->clients);
+        return 0;
 }
 
 static int
-detach_thermostat(struct i2c_adapter *adapter)
+remove_thermostat(struct i2c_client *client)
 {
-        struct thermostat* th;
+        struct thermostat *th = i2c_get_clientdata(client);
         int i;
         
-        if (thermostat == NULL)
-                return 0;
-
-        th = thermostat;
-
         if (thread_therm != NULL) {
                 kthread_stop(thread_therm);
         }
@@ -166,8 +173,6 @@ detach_thermostat(struct i2c_adapter *adapter)
 
         write_both_fan_speed(th, -1);
 
-        i2c_detach_client(&th->clt);
-
         thermostat = NULL;
 
         kfree(th);
@@ -175,14 +180,6 @@ detach_thermostat(struct i2c_adapter *adapter)
         return 0;
 }
 
-static struct i2c_driver thermostat_driver = {  
-        .driver = {
-                .name   = "therm_adt746x",
-        },
-        .attach_adapter = attach_thermostat,
-        .detach_adapter = detach_thermostat,
-};
-
 static int read_fan_speed(struct thermostat *th, u8 addr)
 {
         u8 tmp[2];
@@ -371,8 +368,8 @@ static void set_limit(struct thermostat *th, int i)
                 th->limits[i] = default_limits_local[i] + limit_adjust;
 }
 
-static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
-                                 int busno)
+static int probe_thermostat(struct i2c_client *client,
+                            const struct i2c_device_id *id)
 {
         struct thermostat* th;
         int rc;
@@ -385,16 +382,12 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
         if (!th)
                 return -ENOMEM;
 
-        th->clt.addr = addr;
-        th->clt.adapter = adapter;
-        th->clt.driver = &thermostat_driver;
-        strcpy(th->clt.name, "thermostat");
+        i2c_set_clientdata(client, th);
+        th->clt = client;
 
         rc = read_reg(th, 0);
         if (rc < 0) {
-                printk(KERN_ERR "adt746x: Thermostat failed to read config "
-                                "from bus %d !\n",
-                                busno);
+                dev_err(&client->dev, "Thermostat failed to read config!\n");
                 kfree(th);
                 return -ENODEV;
         }
@@ -423,14 +416,6 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
 
         thermostat = th;
 
-        if (i2c_attach_client(&th->clt)) {
-                printk(KERN_INFO "adt746x: Thermostat failed to attach "
-                                 "client !\n");
-                thermostat = NULL;
-                kfree(th);
-                return -ENODEV;
-        }
-
         /* be sure to really write fan speed the first time */
         th->last_speed[0] = -2;
         th->last_speed[1] = -2;
@@ -456,6 +441,21 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
         return 0;
 }
 
+static const struct i2c_device_id therm_adt746x_id[] = {
+        { "therm_adt746x", 0 },
+        { }
+};
+
+static struct i2c_driver thermostat_driver = {
+        .driver = {
+                .name   = "therm_adt746x",
+        },
+        .attach_adapter = attach_thermostat,
+        .probe = probe_thermostat,
+        .remove = remove_thermostat,
+        .id_table = therm_adt746x_id,
+};
+
 /* 
  * Now, unfortunately, sysfs doesn't give us a nice void * we could
  * pass around to the attribute functions, so we don't really have