1 files changed, 20 insertions, 11 deletions

diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index e452d0daf906..526b7ff179eb 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -50,8 +50,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -60,13 +61,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_2(adm1025, ne1619);
+I2C_CLIENT_INSMOD_2(adm1025, ne1619);
 
 /*
  * The ADM1025 registers
@@ -132,6 +132,7 @@ static struct i2c_driver adm1025_driver = {
 
 struct adm1025_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -312,7 +313,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1025_detect);
+        return i2c_probe(adapter, &addr_data, adm1025_detect);
 }
 
 /*
@@ -416,6 +417,12 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
         adm1025_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -452,6 +459,8 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -464,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client)
         struct adm1025_data *data = i2c_get_clientdata(client);
         int i;
 
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /*
          * Set high limits
@@ -502,15 +511,15 @@ static void adm1025_init_client(struct i2c_client *client)
 
 static int adm1025_detach_client(struct i2c_client *client)
 {
+        struct adm1025_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }