“7f61dbc8cc8c250929d0f3462ebb27accf7ffa6f”上不存在“git@gitcode.net:taosdata/tdengine.git”
提交 7b52eefe 编写于 作者: G Guenter Roeck

hwmon: (emc1403) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 3aa9d1df
...@@ -306,11 +306,10 @@ static int emc1403_probe(struct i2c_client *client, ...@@ -306,11 +306,10 @@ static int emc1403_probe(struct i2c_client *client,
int res; int res;
struct thermal_data *data; struct thermal_data *data;
data = kzalloc(sizeof(struct thermal_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct thermal_data),
if (data == NULL) { GFP_KERNEL);
dev_warn(&client->dev, "out of memory"); if (data == NULL)
return -ENOMEM; return -ENOMEM;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
mutex_init(&data->mutex); mutex_init(&data->mutex);
...@@ -319,21 +318,19 @@ static int emc1403_probe(struct i2c_client *client, ...@@ -319,21 +318,19 @@ static int emc1403_probe(struct i2c_client *client,
res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr); res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr);
if (res) { if (res) {
dev_warn(&client->dev, "create group failed\n"); dev_warn(&client->dev, "create group failed\n");
goto thermal_error1; return res;
} }
data->hwmon_dev = hwmon_device_register(&client->dev); data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) { if (IS_ERR(data->hwmon_dev)) {
res = PTR_ERR(data->hwmon_dev); res = PTR_ERR(data->hwmon_dev);
dev_warn(&client->dev, "register hwmon dev failed\n"); dev_warn(&client->dev, "register hwmon dev failed\n");
goto thermal_error2; goto thermal_error;
} }
dev_info(&client->dev, "EMC1403 Thermal chip found\n"); dev_info(&client->dev, "EMC1403 Thermal chip found\n");
return res; return 0;
thermal_error2: thermal_error:
sysfs_remove_group(&client->dev.kobj, &m_thermal_gr); sysfs_remove_group(&client->dev.kobj, &m_thermal_gr);
thermal_error1:
kfree(data);
return res; return res;
} }
...@@ -343,7 +340,6 @@ static int emc1403_remove(struct i2c_client *client) ...@@ -343,7 +340,6 @@ static int emc1403_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &m_thermal_gr); sysfs_remove_group(&client->dev.kobj, &m_thermal_gr);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册