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/dme1737.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/dme1737.c')
-rw-r--r-- | drivers/hwmon/dme1737.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c index e9cbc727664d..14ebbfb3b14b 100644 --- a/drivers/hwmon/dme1737.c +++ b/drivers/hwmon/dme1737.c | |||
@@ -155,7 +155,7 @@ static const u8 DME1737_BIT_ALARM_FAN[] = {10, 11, 12, 13, 22, 23}; | |||
155 | 155 | ||
156 | struct dme1737_data { | 156 | struct dme1737_data { |
157 | struct i2c_client client; | 157 | struct i2c_client client; |
158 | struct class_device *class_dev; | 158 | struct device *hwmon_dev; |
159 | 159 | ||
160 | struct mutex update_lock; | 160 | struct mutex update_lock; |
161 | int valid; /* !=0 if following fields are valid */ | 161 | int valid; /* !=0 if following fields are valid */ |
@@ -1983,9 +1983,9 @@ static int dme1737_detect(struct i2c_adapter *adapter, int address, | |||
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | /* Register device */ | 1985 | /* Register device */ |
1986 | data->class_dev = hwmon_device_register(&client->dev); | 1986 | data->hwmon_dev = hwmon_device_register(&client->dev); |
1987 | if (IS_ERR(data->class_dev)) { | 1987 | if (IS_ERR(data->hwmon_dev)) { |
1988 | err = PTR_ERR(data->class_dev); | 1988 | err = PTR_ERR(data->hwmon_dev); |
1989 | goto exit_remove; | 1989 | goto exit_remove; |
1990 | } | 1990 | } |
1991 | 1991 | ||
@@ -2030,7 +2030,7 @@ static int dme1737_detach_client(struct i2c_client *client) | |||
2030 | struct dme1737_data *data = i2c_get_clientdata(client); | 2030 | struct dme1737_data *data = i2c_get_clientdata(client); |
2031 | int ix, err; | 2031 | int ix, err; |
2032 | 2032 | ||
2033 | hwmon_device_unregister(data->class_dev); | 2033 | hwmon_device_unregister(data->hwmon_dev); |
2034 | 2034 | ||
2035 | for (ix = 0; ix < ARRAY_SIZE(dme1737_fan_group); ix++) { | 2035 | for (ix = 0; ix < ARRAY_SIZE(dme1737_fan_group); ix++) { |
2036 | if (data->has_fan & (1 << ix)) { | 2036 | if (data->has_fan & (1 << ix)) { |