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
/
adm1021.c
diff --git
a/drivers/hwmon/adm1021.c
b/drivers/hwmon/adm1021.c
index 6649e0688361364c18c9937966223848d65398fe..5667630ac05a8df827e97d69d45230bba12c08ea 100644
(file)
--- a/
drivers/hwmon/adm1021.c
+++ b/
drivers/hwmon/adm1021.c
@@
-91,7
+91,7
@@
clearing it. Weird, ey? --Phil */
/* Each client has this additional data */
struct adm1021_data {
struct i2c_client client;
/* Each client has this additional data */
struct adm1021_data {
struct i2c_client client;
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
enum chips type;
struct mutex update_lock;
enum chips type;
struct mutex update_lock;
@@
-319,9
+319,9
@@
static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
if ((err = sysfs_create_group(&client->dev.kobj, &adm1021_group)))
goto error2;
if ((err = sysfs_create_group(&client->dev.kobj, &adm1021_group)))
goto error2;
- 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 error3;
}
goto error3;
}
@@
-351,7
+351,7
@@
static int adm1021_detach_client(struct i2c_client *client)
struct adm1021_data *data = i2c_get_clientdata(client);
int err;
struct adm1021_data *data = i2c_get_clientdata(client);
int err;
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
sysfs_remove_group(&client->dev.kobj, &adm1021_group);
if ((err = i2c_detach_client(client)))
sysfs_remove_group(&client->dev.kobj, &adm1021_group);
if ((err = i2c_detach_client(client)))
This page took
0.025611 seconds
and
5
git commands to generate.