]> err.no Git - linux-2.6/blobdiff - drivers/hwmon/smsc47m1.c
[PATCH] readahead: reset cache_hit earlier
[linux-2.6] / drivers / hwmon / smsc47m1.c
index 8126fdd7cbee24f68e813b907888977be3932afb..7e699a8ede262916369a88c57001f6de86eafbad 100644 (file)
@@ -31,7 +31,6 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-isa.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -345,7 +344,7 @@ fan_present(2);
 
 static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);
 
-static int smsc47m1_find(unsigned short *addr)
+static int __init smsc47m1_find(unsigned short *addr)
 {
        u8 val;
 
@@ -497,11 +496,8 @@ static int smsc47m1_detach_client(struct i2c_client *client)
 
        hwmon_device_unregister(data->class_dev);
 
-       if ((err = i2c_detach_client(client))) {
-               dev_err(&client->dev, "Client deregistration failed, "
-                       "client not detached.\n");
+       if ((err = i2c_detach_client(client)))
                return err;
-       }
 
        release_region(client->addr, SMSC_EXTENT);
        kfree(data);