projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwmon: Convert from class_device to device
[deliverable/linux.git]
/
drivers
/
hwmon
/
vt1211.c
diff --git
a/drivers/hwmon/vt1211.c
b/drivers/hwmon/vt1211.c
index 9f3e332c5b7fe129f6ec9a62baa3201168ecf0c3..e69416465e6dbbe6fae9295d6fcde620568e26da 100644
(file)
--- a/
drivers/hwmon/vt1211.c
+++ b/
drivers/hwmon/vt1211.c
@@
-108,7
+108,7
@@
static const u8 bitalarmfan[] = {6, 7};
struct vt1211_data {
unsigned short addr;
const char *name;
struct vt1211_data {
unsigned short addr;
const char *name;
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
@@
-1191,9
+1191,9
@@
static int __devinit vt1211_probe(struct platform_device *pdev)
}
/* Register device */
}
/* Register device */
- data->
class
_dev = hwmon_device_register(dev);
- if (IS_ERR(data->
class
_dev)) {
- err = PTR_ERR(data->
class
_dev);
+ data->
hwmon
_dev = hwmon_device_register(dev);
+ if (IS_ERR(data->
hwmon
_dev)) {
+ err = PTR_ERR(data->
hwmon
_dev);
dev_err(dev, "Class registration failed (%d)\n", err);
goto EXIT_DEV_REMOVE_SILENT;
}
dev_err(dev, "Class registration failed (%d)\n", err);
goto EXIT_DEV_REMOVE_SILENT;
}
@@
-1217,7
+1217,7
@@
static int __devexit vt1211_remove(struct platform_device *pdev)
struct vt1211_data *data = platform_get_drvdata(pdev);
struct resource *res;
struct vt1211_data *data = platform_get_drvdata(pdev);
struct resource *res;
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
vt1211_remove_sysfs(pdev);
platform_set_drvdata(pdev, NULL);
kfree(data);
vt1211_remove_sysfs(pdev);
platform_set_drvdata(pdev, NULL);
kfree(data);
This page took
0.029643 seconds
and
5
git commands to generate.