aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-20 03:04:42 -0400
committerLee Jones <lee.jones@linaro.org>2013-08-20 03:51:23 -0400
commit0010dd3883b8a5e99c7d4093b97e9e34300a2f03 (patch)
tree7a4d53351710a58e7f03fbfbbd571de0e3e7053a /drivers/mfd
parent6922ffcfad1a5ff8cd0e44bbcee3686dd6caf13c (diff)
mfd: max8998: Use devm_*() functions
Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max8998.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 45bffb8c7236..fe6332dcabee 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -188,7 +188,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
188 struct max8998_dev *max8998; 188 struct max8998_dev *max8998;
189 int ret = 0; 189 int ret = 0;
190 190
191 max8998 = kzalloc(sizeof(struct max8998_dev), GFP_KERNEL); 191 max8998 = devm_kzalloc(&i2c->dev, sizeof(struct max8998_dev),
192 GFP_KERNEL);
192 if (max8998 == NULL) 193 if (max8998 == NULL)
193 return -ENOMEM; 194 return -ENOMEM;
194 195
@@ -246,7 +247,6 @@ err:
246 mfd_remove_devices(max8998->dev); 247 mfd_remove_devices(max8998->dev);
247 max8998_irq_exit(max8998); 248 max8998_irq_exit(max8998);
248 i2c_unregister_device(max8998->rtc); 249 i2c_unregister_device(max8998->rtc);
249 kfree(max8998);
250 return ret; 250 return ret;
251} 251}
252 252
@@ -257,7 +257,6 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
257 mfd_remove_devices(max8998->dev); 257 mfd_remove_devices(max8998->dev);
258 max8998_irq_exit(max8998); 258 max8998_irq_exit(max8998);
259 i2c_unregister_device(max8998->rtc); 259 i2c_unregister_device(max8998->rtc);
260 kfree(max8998);
261 260
262 return 0; 261 return 0;
263} 262}