aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-02 13:35:52 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-09-24 00:08:32 -0400
commit78968642cc4b57c37d18b0242643026abc92717b (patch)
treec8544def126e30d98d60610581556e7070fc6b99 /drivers/hwmon
parent7008b9704ada3d7483358da7a3c7c640e1e0be17 (diff)
hwmon: (ltc4151) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Cc: Per Dalen <per.dalen@appeartv.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/ltc4151.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c
index 4d005b219de2..8496baa08bc8 100644
--- a/drivers/hwmon/ltc4151.c
+++ b/drivers/hwmon/ltc4151.c
@@ -181,11 +181,9 @@ static int ltc4151_probe(struct i2c_client *client,
181 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) 181 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
182 return -ENODEV; 182 return -ENODEV;
183 183
184 data = kzalloc(sizeof(*data), GFP_KERNEL); 184 data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
185 if (!data) { 185 if (!data)
186 ret = -ENOMEM; 186 return -ENOMEM;
187 goto out_kzalloc;
188 }
189 187
190 i2c_set_clientdata(client, data); 188 i2c_set_clientdata(client, data);
191 mutex_init(&data->update_lock); 189 mutex_init(&data->update_lock);
@@ -193,7 +191,7 @@ static int ltc4151_probe(struct i2c_client *client,
193 /* Register sysfs hooks */ 191 /* Register sysfs hooks */
194 ret = sysfs_create_group(&client->dev.kobj, &ltc4151_group); 192 ret = sysfs_create_group(&client->dev.kobj, &ltc4151_group);
195 if (ret) 193 if (ret)
196 goto out_sysfs_create_group; 194 return ret;
197 195
198 data->hwmon_dev = hwmon_device_register(&client->dev); 196 data->hwmon_dev = hwmon_device_register(&client->dev);
199 if (IS_ERR(data->hwmon_dev)) { 197 if (IS_ERR(data->hwmon_dev)) {
@@ -205,9 +203,6 @@ static int ltc4151_probe(struct i2c_client *client,
205 203
206out_hwmon_device_register: 204out_hwmon_device_register:
207 sysfs_remove_group(&client->dev.kobj, &ltc4151_group); 205 sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
208out_sysfs_create_group:
209 kfree(data);
210out_kzalloc:
211 return ret; 206 return ret;
212} 207}
213 208
@@ -218,8 +213,6 @@ static int ltc4151_remove(struct i2c_client *client)
218 hwmon_device_unregister(data->hwmon_dev); 213 hwmon_device_unregister(data->hwmon_dev);
219 sysfs_remove_group(&client->dev.kobj, &ltc4151_group); 214 sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
220 215
221 kfree(data);
222
223 return 0; 216 return 0;
224} 217}
225 218