aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/w83l785ts.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-08-20 16:46:20 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:30 -0400
commit1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch)
tree039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/w83l785ts.c
parent59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (diff)
hwmon: Convert from class_device to device
Convert from class_device to device for hwmon_device_register/unregister Signed-off-by: Tony Jones <tonyj@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon/w83l785ts.c')
-rw-r--r--drivers/hwmon/w83l785ts.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index a3fcace412f0..b5db354e2f19 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -107,7 +107,7 @@ static struct i2c_driver w83l785ts_driver = {
107 107
108struct w83l785ts_data { 108struct w83l785ts_data {
109 struct i2c_client client; 109 struct i2c_client client;
110 struct class_device *class_dev; 110 struct device *hwmon_dev;
111 struct mutex update_lock; 111 struct mutex update_lock;
112 char valid; /* zero until following fields are valid */ 112 char valid; /* zero until following fields are valid */
113 unsigned long last_updated; /* in jiffies */ 113 unsigned long last_updated; /* in jiffies */
@@ -247,9 +247,9 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
247 goto exit_remove; 247 goto exit_remove;
248 248
249 /* Register sysfs hooks */ 249 /* Register sysfs hooks */
250 data->class_dev = hwmon_device_register(&new_client->dev); 250 data->hwmon_dev = hwmon_device_register(&new_client->dev);
251 if (IS_ERR(data->class_dev)) { 251 if (IS_ERR(data->hwmon_dev)) {
252 err = PTR_ERR(data->class_dev); 252 err = PTR_ERR(data->hwmon_dev);
253 goto exit_remove; 253 goto exit_remove;
254 } 254 }
255 255
@@ -272,7 +272,7 @@ static int w83l785ts_detach_client(struct i2c_client *client)
272 struct w83l785ts_data *data = i2c_get_clientdata(client); 272 struct w83l785ts_data *data = i2c_get_clientdata(client);
273 int err; 273 int err;
274 274
275 hwmon_device_unregister(data->class_dev); 275 hwmon_device_unregister(data->hwmon_dev);
276 device_remove_file(&client->dev, 276 device_remove_file(&client->dev,
277 &sensor_dev_attr_temp1_input.dev_attr); 277 &sensor_dev_attr_temp1_input.dev_attr);
278 device_remove_file(&client->dev, 278 device_remove_file(&client->dev,