Commit 31e38791 authored by Axel Lin's avatar Axel Lin Committed by Guenter Roeck

hwmon: (ltc4151) Convert to devm_hwmon_device_register_with_groups

Use ATTRIBUTE_GROUPS macro and devm_hwmon_device_register_with_groups to
simplify the code a bit.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Tested-by: default avatarPer Dalén <per.dalen@appeartv.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 590e8534
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define LTC4151_ADIN_L 0x05 #define LTC4151_ADIN_L 0x05
struct ltc4151_data { struct ltc4151_data {
struct device *hwmon_dev; struct i2c_client *client;
struct mutex update_lock; struct mutex update_lock;
bool valid; bool valid;
...@@ -59,8 +59,8 @@ struct ltc4151_data { ...@@ -59,8 +59,8 @@ struct ltc4151_data {
static struct ltc4151_data *ltc4151_update_device(struct device *dev) static struct ltc4151_data *ltc4151_update_device(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct ltc4151_data *data = dev_get_drvdata(dev);
struct ltc4151_data *data = i2c_get_clientdata(client); struct i2c_client *client = data->client;
struct ltc4151_data *ret = data; struct ltc4151_data *ret = data;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
...@@ -159,7 +159,7 @@ static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, ltc4151_show_value, NULL, ...@@ -159,7 +159,7 @@ static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, ltc4151_show_value, NULL,
* Finally, construct an array of pointers to members of the above objects, * Finally, construct an array of pointers to members of the above objects,
* as required for sysfs_create_group() * as required for sysfs_create_group()
*/ */
static struct attribute *ltc4151_attributes[] = { static struct attribute *ltc4151_attrs[] = {
&sensor_dev_attr_in1_input.dev_attr.attr, &sensor_dev_attr_in1_input.dev_attr.attr,
&sensor_dev_attr_in2_input.dev_attr.attr, &sensor_dev_attr_in2_input.dev_attr.attr,
...@@ -167,54 +167,30 @@ static struct attribute *ltc4151_attributes[] = { ...@@ -167,54 +167,30 @@ static struct attribute *ltc4151_attributes[] = {
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(ltc4151);
static const struct attribute_group ltc4151_group = {
.attrs = ltc4151_attributes,
};
static int ltc4151_probe(struct i2c_client *client, static int ltc4151_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = client->adapter; struct i2c_adapter *adapter = client->adapter;
struct device *dev = &client->dev;
struct ltc4151_data *data; struct ltc4151_data *data;
int ret; struct device *hwmon_dev;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -ENODEV; return -ENODEV;
data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(client, data); data->client = client;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
/* Register sysfs hooks */ hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name,
ret = sysfs_create_group(&client->dev.kobj, &ltc4151_group); data,
if (ret) ltc4151_groups);
return ret; return PTR_ERR_OR_ZERO(hwmon_dev);
data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) {
ret = PTR_ERR(data->hwmon_dev);
goto out_hwmon_device_register;
}
return 0;
out_hwmon_device_register:
sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
return ret;
}
static int ltc4151_remove(struct i2c_client *client)
{
struct ltc4151_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
return 0;
} }
static const struct i2c_device_id ltc4151_id[] = { static const struct i2c_device_id ltc4151_id[] = {
...@@ -229,7 +205,6 @@ static struct i2c_driver ltc4151_driver = { ...@@ -229,7 +205,6 @@ static struct i2c_driver ltc4151_driver = {
.name = "ltc4151", .name = "ltc4151",
}, },
.probe = ltc4151_probe, .probe = ltc4151_probe,
.remove = ltc4151_remove,
.id_table = ltc4151_id, .id_table = ltc4151_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment