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/smsc47m192.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/smsc47m192.c')
-rw-r--r-- | drivers/hwmon/smsc47m192.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c index d3a3ba04cb0f..0efcd27b2523 100644 --- a/drivers/hwmon/smsc47m192.c +++ b/drivers/hwmon/smsc47m192.c | |||
@@ -97,7 +97,7 @@ static inline int TEMP_FROM_REG(s8 val) | |||
97 | 97 | ||
98 | struct smsc47m192_data { | 98 | struct smsc47m192_data { |
99 | struct i2c_client client; | 99 | struct i2c_client client; |
100 | struct class_device *class_dev; | 100 | struct device *hwmon_dev; |
101 | struct mutex update_lock; | 101 | struct mutex update_lock; |
102 | char valid; /* !=0 if following fields are valid */ | 102 | char valid; /* !=0 if following fields are valid */ |
103 | unsigned long last_updated; /* In jiffies */ | 103 | unsigned long last_updated; /* In jiffies */ |
@@ -553,9 +553,9 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address, | |||
553 | goto exit_remove_files; | 553 | goto exit_remove_files; |
554 | } | 554 | } |
555 | 555 | ||
556 | data->class_dev = hwmon_device_register(&client->dev); | 556 | data->hwmon_dev = hwmon_device_register(&client->dev); |
557 | if (IS_ERR(data->class_dev)) { | 557 | if (IS_ERR(data->hwmon_dev)) { |
558 | err = PTR_ERR(data->class_dev); | 558 | err = PTR_ERR(data->hwmon_dev); |
559 | goto exit_remove_files; | 559 | goto exit_remove_files; |
560 | } | 560 | } |
561 | 561 | ||
@@ -577,7 +577,7 @@ static int smsc47m192_detach_client(struct i2c_client *client) | |||
577 | struct smsc47m192_data *data = i2c_get_clientdata(client); | 577 | struct smsc47m192_data *data = i2c_get_clientdata(client); |
578 | int err; | 578 | int err; |
579 | 579 | ||
580 | hwmon_device_unregister(data->class_dev); | 580 | hwmon_device_unregister(data->hwmon_dev); |
581 | sysfs_remove_group(&client->dev.kobj, &smsc47m192_group); | 581 | sysfs_remove_group(&client->dev.kobj, &smsc47m192_group); |
582 | sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4); | 582 | sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4); |
583 | 583 | ||