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
/
sis5595.c
diff --git
a/drivers/hwmon/sis5595.c
b/drivers/hwmon/sis5595.c
index 92956eb3f3c15b657bcabf341cf4984b484cbbd0..3de9721aa67fcf5df2829511f8fefc4a56904366 100644
(file)
--- a/
drivers/hwmon/sis5595.c
+++ b/
drivers/hwmon/sis5595.c
@@
-163,7
+163,7
@@
static inline u8 DIV_TO_REG(int val)
struct sis5595_data {
unsigned short addr;
const char *name;
struct sis5595_data {
unsigned short addr;
const char *name;
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
struct mutex lock;
struct mutex update_lock;
struct mutex lock;
struct mutex update_lock;
@@
-557,9
+557,9
@@
static int __devinit sis5595_probe(struct platform_device *pdev)
goto exit_remove_files;
}
goto exit_remove_files;
}
- data->
class
_dev = hwmon_device_register(&pdev->dev);
- if (IS_ERR(data->
class
_dev)) {
- err = PTR_ERR(data->
class
_dev);
+ data->
hwmon
_dev = hwmon_device_register(&pdev->dev);
+ if (IS_ERR(data->
hwmon
_dev)) {
+ err = PTR_ERR(data->
hwmon
_dev);
goto exit_remove_files;
}
goto exit_remove_files;
}
@@
-580,7
+580,7
@@
static int __devexit sis5595_remove(struct platform_device *pdev)
{
struct sis5595_data *data = platform_get_drvdata(pdev);
{
struct sis5595_data *data = platform_get_drvdata(pdev);
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
sysfs_remove_group(&pdev->dev.kobj, &sis5595_group);
sysfs_remove_group(&pdev->dev.kobj, &sis5595_group_opt);
sysfs_remove_group(&pdev->dev.kobj, &sis5595_group);
sysfs_remove_group(&pdev->dev.kobj, &sis5595_group_opt);
This page took
0.04533 seconds
and
5
git commands to generate.