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
/
ad7418.c
diff --git
a/drivers/hwmon/ad7418.c
b/drivers/hwmon/ad7418.c
index 879ea72ee3bd24d3874dca89b77df72bacfb0b67..fcd7fe78f3f9838b891635a2186d3170dc5a1ba4 100644
(file)
--- a/
drivers/hwmon/ad7418.c
+++ b/
drivers/hwmon/ad7418.c
@@
-47,7
+47,7
@@
static const u8 AD7418_REG_TEMP[] = { AD7418_REG_TEMP_IN,
struct ad7418_data {
struct i2c_client client;
struct ad7418_data {
struct i2c_client client;
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
struct attribute_group attrs;
enum chips type;
struct mutex lock;
struct attribute_group attrs;
enum chips type;
struct mutex lock;
@@
-326,9
+326,9
@@
static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind)
if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
goto exit_detach;
if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
goto exit_detach;
- 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;
}
goto exit_remove;
}
@@
-347,7
+347,7
@@
exit:
static int ad7418_detach_client(struct i2c_client *client)
{
struct ad7418_data *data = i2c_get_clientdata(client);
static int ad7418_detach_client(struct i2c_client *client)
{
struct ad7418_data *data = i2c_get_clientdata(client);
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
sysfs_remove_group(&client->dev.kobj, &data->attrs);
i2c_detach_client(client);
kfree(data);
sysfs_remove_group(&client->dev.kobj, &data->attrs);
i2c_detach_client(client);
kfree(data);
This page took
0.038098 seconds
and
5
git commands to generate.