diff options
| author | Tony Jones <tonyj@suse.de> | 2007-08-20 22:46:20 +0200 |
|---|---|---|
| committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-10-10 04:56:30 +0200 |
| commit | 1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch) | |
| tree | 039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/dme1737.c | |
| parent | hwmon: (coretemp) Remove bogus __cpuinitdata etc cleanup (diff) | |
| download | linux-1beeffe43311f64df8dd0ab08ff6b1858c58363f.tar.xz linux-1beeffe43311f64df8dd0ab08ff6b1858c58363f.zip | |
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}; struct dme1737_data { struct i2c_client client; - struct class_device *class_dev; + struct device *hwmon_dev; struct mutex update_lock; int valid; /* !=0 if following fields are valid */ @@ -1983,9 +1983,9 @@ static int dme1737_detect(struct i2c_adapter *adapter, int address, } /* Register device */ - data->class_dev = hwmon_device_register(&client->dev); - if (IS_ERR(data->class_dev)) { - err = PTR_ERR(data->class_dev); + data->hwmon_dev = hwmon_device_register(&client->dev); + if (IS_ERR(data->hwmon_dev)) { + err = PTR_ERR(data->hwmon_dev); goto exit_remove; } @@ -2030,7 +2030,7 @@ static int dme1737_detach_client(struct i2c_client *client) struct dme1737_data *data = i2c_get_clientdata(client); int ix, err; - hwmon_device_unregister(data->class_dev); + hwmon_device_unregister(data->hwmon_dev); for (ix = 0; ix < ARRAY_SIZE(dme1737_fan_group); ix++) { if (data->has_fan & (1 << ix)) { |