diff options
author | Tony Jones <tonyj@suse.de> | 2007-08-20 16:46:20 -0400 |
---|---|---|
committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-10-09 22:56:30 -0400 |
commit | 1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch) | |
tree | 039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/w83793.c | |
parent | 59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (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/w83793.c')
-rw-r--r-- | drivers/hwmon/w83793.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 253ffaf1568a..48599e1cc554 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
@@ -179,7 +179,7 @@ static inline s8 TEMP_TO_REG(long val, s8 min, s8 max) | |||
179 | struct w83793_data { | 179 | struct w83793_data { |
180 | struct i2c_client client; | 180 | struct i2c_client client; |
181 | struct i2c_client *lm75[2]; | 181 | struct i2c_client *lm75[2]; |
182 | struct class_device *class_dev; | 182 | struct device *hwmon_dev; |
183 | struct mutex update_lock; | 183 | struct mutex update_lock; |
184 | char valid; /* !=0 if following fields are valid */ | 184 | char valid; /* !=0 if following fields are valid */ |
185 | unsigned long last_updated; /* In jiffies */ | 185 | unsigned long last_updated; /* In jiffies */ |
@@ -1075,7 +1075,7 @@ static int w83793_detach_client(struct i2c_client *client) | |||
1075 | 1075 | ||
1076 | /* main client */ | 1076 | /* main client */ |
1077 | if (data) { | 1077 | if (data) { |
1078 | hwmon_device_unregister(data->class_dev); | 1078 | hwmon_device_unregister(data->hwmon_dev); |
1079 | 1079 | ||
1080 | for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) | 1080 | for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) |
1081 | device_remove_file(dev, | 1081 | device_remove_file(dev, |
@@ -1434,9 +1434,9 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1434 | } | 1434 | } |
1435 | } | 1435 | } |
1436 | 1436 | ||
1437 | data->class_dev = hwmon_device_register(dev); | 1437 | data->hwmon_dev = hwmon_device_register(dev); |
1438 | if (IS_ERR(data->class_dev)) { | 1438 | if (IS_ERR(data->hwmon_dev)) { |
1439 | err = PTR_ERR(data->class_dev); | 1439 | err = PTR_ERR(data->hwmon_dev); |
1440 | goto exit_remove; | 1440 | goto exit_remove; |
1441 | } | 1441 | } |
1442 | 1442 | ||