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/adm1031.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/adm1031.c')
-rw-r--r-- | drivers/hwmon/adm1031.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c index 122683fc91d0..37cfc101da5e 100644 --- a/drivers/hwmon/adm1031.c +++ b/drivers/hwmon/adm1031.c | |||
@@ -70,7 +70,7 @@ typedef u8 auto_chan_table_t[8][2]; | |||
70 | /* Each client has this additional data */ | 70 | /* Each client has this additional data */ |
71 | struct adm1031_data { | 71 | struct adm1031_data { |
72 | struct i2c_client client; | 72 | struct i2c_client client; |
73 | struct class_device *class_dev; | 73 | struct device *hwmon_dev; |
74 | struct mutex update_lock; | 74 | struct mutex update_lock; |
75 | int chip_type; | 75 | int chip_type; |
76 | char valid; /* !=0 if following fields are valid */ | 76 | char valid; /* !=0 if following fields are valid */ |
@@ -853,9 +853,9 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) | |||
853 | goto exit_remove; | 853 | goto exit_remove; |
854 | } | 854 | } |
855 | 855 | ||
856 | data->class_dev = hwmon_device_register(&new_client->dev); | 856 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
857 | if (IS_ERR(data->class_dev)) { | 857 | if (IS_ERR(data->hwmon_dev)) { |
858 | err = PTR_ERR(data->class_dev); | 858 | err = PTR_ERR(data->hwmon_dev); |
859 | goto exit_remove; | 859 | goto exit_remove; |
860 | } | 860 | } |
861 | 861 | ||
@@ -877,7 +877,7 @@ static int adm1031_detach_client(struct i2c_client *client) | |||
877 | struct adm1031_data *data = i2c_get_clientdata(client); | 877 | struct adm1031_data *data = i2c_get_clientdata(client); |
878 | int ret; | 878 | int ret; |
879 | 879 | ||
880 | hwmon_device_unregister(data->class_dev); | 880 | hwmon_device_unregister(data->hwmon_dev); |
881 | sysfs_remove_group(&client->dev.kobj, &adm1031_group); | 881 | sysfs_remove_group(&client->dev.kobj, &adm1031_group); |
882 | sysfs_remove_group(&client->dev.kobj, &adm1031_group_opt); | 882 | sysfs_remove_group(&client->dev.kobj, &adm1031_group_opt); |
883 | if ((ret = i2c_detach_client(client)) != 0) { | 883 | if ((ret = i2c_detach_client(client)) != 0) { |