aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/k8temp.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/k8temp.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/k8temp.c')
-rw-r--r--drivers/hwmon/k8temp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 5d8d0ca08fa9..bd2bde0ef95e 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -38,7 +38,7 @@
38#define SEL_CORE 0x04 38#define SEL_CORE 0x04
39 39
40struct k8temp_data { 40struct k8temp_data {
41 struct class_device *class_dev; 41 struct device *hwmon_dev;
42 struct mutex update_lock; 42 struct mutex update_lock;
43 const char *name; 43 const char *name;
44 char valid; /* zero until following fields are valid */ 44 char valid; /* zero until following fields are valid */
@@ -225,10 +225,10 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
225 if (err) 225 if (err)
226 goto exit_remove; 226 goto exit_remove;
227 227
228 data->class_dev = hwmon_device_register(&pdev->dev); 228 data->hwmon_dev = hwmon_device_register(&pdev->dev);
229 229
230 if (IS_ERR(data->class_dev)) { 230 if (IS_ERR(data->hwmon_dev)) {
231 err = PTR_ERR(data->class_dev); 231 err = PTR_ERR(data->hwmon_dev);
232 goto exit_remove; 232 goto exit_remove;
233 } 233 }
234 234
@@ -255,7 +255,7 @@ static void __devexit k8temp_remove(struct pci_dev *pdev)
255{ 255{
256 struct k8temp_data *data = dev_get_drvdata(&pdev->dev); 256 struct k8temp_data *data = dev_get_drvdata(&pdev->dev);
257 257
258 hwmon_device_unregister(data->class_dev); 258 hwmon_device_unregister(data->hwmon_dev);
259 device_remove_file(&pdev->dev, 259 device_remove_file(&pdev->dev,
260 &sensor_dev_attr_temp1_input.dev_attr); 260 &sensor_dev_attr_temp1_input.dev_attr);
261 device_remove_file(&pdev->dev, 261 device_remove_file(&pdev->dev,