diff options
Diffstat (limited to 'drivers/hwmon/abituguru.c')
-rw-r--r-- | drivers/hwmon/abituguru.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c index 2317f4bb9c92..4dbdb81ea3b1 100644 --- a/drivers/hwmon/abituguru.c +++ b/drivers/hwmon/abituguru.c | |||
@@ -176,7 +176,7 @@ MODULE_PARM_DESC(verbose, "How verbose should the driver be? (0-3):\n" | |||
176 | The structure is dynamically allocated, at the same time when a new | 176 | The structure is dynamically allocated, at the same time when a new |
177 | abituguru device is allocated. */ | 177 | abituguru device is allocated. */ |
178 | struct abituguru_data { | 178 | struct abituguru_data { |
179 | struct class_device *class_dev; /* hwmon registered device */ | 179 | struct device *hwmon_dev; /* hwmon registered device */ |
180 | struct mutex update_lock; /* protect access to data and uGuru */ | 180 | struct mutex update_lock; /* protect access to data and uGuru */ |
181 | unsigned long last_updated; /* In jiffies */ | 181 | unsigned long last_updated; /* In jiffies */ |
182 | unsigned short addr; /* uguru base address */ | 182 | unsigned short addr; /* uguru base address */ |
@@ -1287,11 +1287,11 @@ static int __devinit abituguru_probe(struct platform_device *pdev) | |||
1287 | &abituguru_sysfs_attr[i].dev_attr)) | 1287 | &abituguru_sysfs_attr[i].dev_attr)) |
1288 | goto abituguru_probe_error; | 1288 | goto abituguru_probe_error; |
1289 | 1289 | ||
1290 | data->class_dev = hwmon_device_register(&pdev->dev); | 1290 | data->hwmon_dev = hwmon_device_register(&pdev->dev); |
1291 | if (!IS_ERR(data->class_dev)) | 1291 | if (!IS_ERR(data->hwmon_dev)) |
1292 | return 0; /* success */ | 1292 | return 0; /* success */ |
1293 | 1293 | ||
1294 | res = PTR_ERR(data->class_dev); | 1294 | res = PTR_ERR(data->hwmon_dev); |
1295 | abituguru_probe_error: | 1295 | abituguru_probe_error: |
1296 | for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++) | 1296 | for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++) |
1297 | device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr); | 1297 | device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr); |
@@ -1308,7 +1308,7 @@ static int __devexit abituguru_remove(struct platform_device *pdev) | |||
1308 | int i; | 1308 | int i; |
1309 | struct abituguru_data *data = platform_get_drvdata(pdev); | 1309 | struct abituguru_data *data = platform_get_drvdata(pdev); |
1310 | 1310 | ||
1311 | hwmon_device_unregister(data->class_dev); | 1311 | hwmon_device_unregister(data->hwmon_dev); |
1312 | for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++) | 1312 | for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++) |
1313 | device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr); | 1313 | device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr); |
1314 | for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) | 1314 | for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) |