提交 57457e31 编写于 作者: G Guenter Roeck

hwmon: (ads1015) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 08940b8a
...@@ -156,7 +156,6 @@ static int ads1015_remove(struct i2c_client *client) ...@@ -156,7 +156,6 @@ static int ads1015_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
for (k = 0; k < ADS1015_CHANNELS; ++k) for (k = 0; k < ADS1015_CHANNELS; ++k)
device_remove_file(&client->dev, &ads1015_in[k].dev_attr); device_remove_file(&client->dev, &ads1015_in[k].dev_attr);
kfree(data);
return 0; return 0;
} }
...@@ -254,11 +253,10 @@ static int ads1015_probe(struct i2c_client *client, ...@@ -254,11 +253,10 @@ static int ads1015_probe(struct i2c_client *client,
int err; int err;
unsigned int k; unsigned int k;
data = kzalloc(sizeof(struct ads1015_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct ads1015_data),
if (!data) { GFP_KERNEL);
err = -ENOMEM; if (!data)
goto exit; return -ENOMEM;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
...@@ -284,8 +282,6 @@ static int ads1015_probe(struct i2c_client *client, ...@@ -284,8 +282,6 @@ static int ads1015_probe(struct i2c_client *client,
exit_remove: exit_remove:
for (k = 0; k < ADS1015_CHANNELS; ++k) for (k = 0; k < ADS1015_CHANNELS; ++k)
device_remove_file(&client->dev, &ads1015_in[k].dev_attr); device_remove_file(&client->dev, &ads1015_in[k].dev_attr);
kfree(data);
exit:
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册