Skip to content

Commit

Permalink
hwmon: (w83l785ts) Convert to use devm_ functions
Browse files Browse the repository at this point in the history
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Guenter Roeck committed Jul 22, 2012
1 parent f187fc0 commit e2730be
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/hwmon/w83l785ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,11 @@ static int w83l785ts_probe(struct i2c_client *client,
{
struct w83l785ts_data *data;
struct device *dev = &client->dev;
int err = 0;
int err;

data = kzalloc(sizeof(struct w83l785ts_data), GFP_KERNEL);
if (!data) {
err = -ENOMEM;
goto exit;
}
data = devm_kzalloc(dev, sizeof(struct w83l785ts_data), GFP_KERNEL);
if (!data)
return -ENOMEM;

i2c_set_clientdata(client, data);
data->valid = 0;
Expand All @@ -203,7 +201,7 @@ static int w83l785ts_probe(struct i2c_client *client,

err = device_create_file(dev, &sensor_dev_attr_temp1_input.dev_attr);
if (err)
goto exit_remove;
return err;

err = device_create_file(dev, &sensor_dev_attr_temp1_max.dev_attr);
if (err)
Expand All @@ -221,8 +219,6 @@ static int w83l785ts_probe(struct i2c_client *client,
exit_remove:
device_remove_file(dev, &sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(dev, &sensor_dev_attr_temp1_max.dev_attr);
kfree(data);
exit:
return err;
}

Expand All @@ -236,7 +232,6 @@ static int w83l785ts_remove(struct i2c_client *client)
device_remove_file(&client->dev,
&sensor_dev_attr_temp1_max.dev_attr);

kfree(data);
return 0;
}

Expand Down

0 comments on commit e2730be

Please sign in to comment.