nfsd4: remove unnecessary lease-setting function

[safe/jmp/linux-2.6] / drivers / macintosh / therm_pm72.c

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index ddfb426..454bc50 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -123,14 +123,14 @@
 #include <linux/i2c.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/sections.h>
-#include <asm/of_device.h>
 #include <asm/macio.h>
-#include <asm/of_platform.h>
 
 #include "therm_pm72.h"
 
@@ -286,21 +286,7 @@ struct fcu_fan_table       fcu_fans[] = {
        },
 };
 
-/*
- * i2c_driver structure to attach to the host i2c controller
- */
-
-static int therm_pm72_attach(struct i2c_adapter *adapter);
-static int therm_pm72_detach(struct i2c_adapter *adapter);
-
-static struct i2c_driver therm_pm72_driver =
-{
-       .driver = {
-               .name   = "therm_pm72",
-       },
-       .attach_adapter = therm_pm72_attach,
-       .detach_adapter = therm_pm72_detach,
-};
+static struct i2c_driver therm_pm72_driver;
 
 /*
  * Utility function to create an i2c_client structure and
@@ -310,6 +296,7 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name)
 {
        struct i2c_client *clt;
        struct i2c_adapter *adap;
+       struct i2c_board_info info;
 
        if (id & 0x200)
                adap = k2;
@@ -320,31 +307,21 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name)
        if (adap == NULL)
                return NULL;
 
-       clt = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (clt == NULL)
-               return NULL;
-
-       clt->addr = (id >> 1) & 0x7f;
-       clt->adapter = adap;
-       clt->driver = &therm_pm72_driver;
-       strncpy(clt->name, name, I2C_NAME_SIZE-1);
-
-       if (i2c_attach_client(clt)) {
+       memset(&info, 0, sizeof(struct i2c_board_info));
+       info.addr = (id >> 1) & 0x7f;
+       strlcpy(info.type, "therm_pm72", I2C_NAME_SIZE);
+       clt = i2c_new_device(adap, &info);
+       if (!clt) {
                printk(KERN_ERR "therm_pm72: Failed to attach to i2c ID 0x%x\n", id);
-               kfree(clt);
                return NULL;
        }
-       return clt;
-}
 
-/*
- * Utility function to get rid of the i2c_client structure
- * (will also detach from the adapter hopepfully)
- */
-static void detach_i2c_chip(struct i2c_client *clt)
-{
-       i2c_detach_client(clt);
-       kfree(clt);
+       /*
+        * 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(&clt->detected, &therm_pm72_driver.clients);
+       return clt;
 }
 
 /*
@@ -1203,8 +1180,6 @@ static int init_cpu_state(struct cpu_pid_state *state, int index)
 
        return 0;
  fail:
-       if (state->monitor)
-               detach_i2c_chip(state->monitor);
        state->monitor = NULL;
        
        return -ENODEV;
@@ -1232,7 +1207,6 @@ static void dispose_cpu_state(struct cpu_pid_state *state)
                device_remove_file(&of_dev->dev, &dev_attr_cpu1_intake_fan_rpm);
        }
 
-       detach_i2c_chip(state->monitor);
        state->monitor = NULL;
 }
 
@@ -1407,7 +1381,6 @@ static void dispose_backside_state(struct backside_pid_state *state)
        device_remove_file(&of_dev->dev, &dev_attr_backside_temperature);
        device_remove_file(&of_dev->dev, &dev_attr_backside_fan_pwm);
 
-       detach_i2c_chip(state->monitor);
        state->monitor = NULL;
 }
  
@@ -1532,7 +1505,6 @@ static void dispose_drives_state(struct drives_pid_state *state)
        device_remove_file(&of_dev->dev, &dev_attr_drives_temperature);
        device_remove_file(&of_dev->dev, &dev_attr_drives_fan_rpm);
 
-       detach_i2c_chip(state->monitor);
        state->monitor = NULL;
 }
 
@@ -1654,7 +1626,6 @@ static void dispose_dimms_state(struct dimm_pid_state *state)
 
        device_remove_file(&of_dev->dev, &dev_attr_dimms_temperature);
 
-       detach_i2c_chip(state->monitor);
        state->monitor = NULL;
 }
 
@@ -1779,7 +1750,6 @@ static void dispose_slots_state(struct slots_pid_state *state)
        device_remove_file(&of_dev->dev, &dev_attr_slots_temperature);
        device_remove_file(&of_dev->dev, &dev_attr_slots_fan_pwm);
 
-       detach_i2c_chip(state->monitor);
        state->monitor = NULL;
 }
 
@@ -2008,8 +1978,6 @@ static int attach_fcu(void)
  */
 static void detach_fcu(void)
 {
-       if (fcu)
-               detach_i2c_chip(fcu);
        fcu = NULL;
 }
 
@@ -2060,12 +2028,21 @@ static int therm_pm72_attach(struct i2c_adapter *adapter)
        return 0;
 }
 
+static int therm_pm72_probe(struct i2c_client *client,
+                           const struct i2c_device_id *id)
+{
+       /* Always succeed, the real work was done in therm_pm72_attach() */
+       return 0;
+}
+
 /*
- * Called on every adapter when the driver or the i2c controller
+ * Called when any of the devices which participates into thermal management
  * is going away.
  */
-static int therm_pm72_detach(struct i2c_adapter *adapter)
+static int therm_pm72_remove(struct i2c_client *client)
 {
+       struct i2c_adapter *adapter = client->adapter;
+
        mutex_lock(&driver_lock);
 
        if (state != state_detached)
@@ -2096,6 +2073,30 @@ static int therm_pm72_detach(struct i2c_adapter *adapter)
        return 0;
 }
 
+/*
+ * i2c_driver structure to attach to the host i2c controller
+ */
+
+static const struct i2c_device_id therm_pm72_id[] = {
+       /*
+        * Fake device name, thermal management is done by several
+        * chips but we don't need to differentiate between them at
+        * this point.
+        */
+       { "therm_pm72", 0 },
+       { }
+};
+
+static struct i2c_driver therm_pm72_driver = {
+       .driver = {
+               .name   = "therm_pm72",
+       },
+       .attach_adapter = therm_pm72_attach,
+       .probe          = therm_pm72_probe,
+       .remove         = therm_pm72_remove,
+       .id_table       = therm_pm72_id,
+};
+
 static int fan_check_loc_match(const char *loc, int fan)
 {
        char    tmp[64];
@@ -2210,7 +2211,7 @@ static int fcu_of_remove(struct of_device* dev)
        return 0;
 }
 
-static struct of_device_id fcu_match[] = 
+static const struct of_device_id fcu_match[] = 
 {
        {
        .type           = "fcu",