From: Guenter Roeck <linux@roeck-us.net>
Date: Mon, 18 Jun 2012 15:26:05 +0000 (-0700)
Subject: hwmon: (w83l785ts) Convert to use devm_ functions
X-Git-Tag: upstream/snapshot3+hdmi~6992^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2730bea0b9951cb8ec0732045f59eea360f5e7c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

hwmon: (w83l785ts) Convert to use devm_ functions

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>
---

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 6d45d23..39dbe99 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -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;
@@ -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)
@@ -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;
 }
 
@@ -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;
 }