aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 16:43:04 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-01-08 18:37:39 -0500
commitf57723457045eb281dcf8d364d1c7292d242ff68 (patch)
tree88264ab11ea0fb2fff504918e5795f7acefc56e3 /drivers/mfd
parentee66e653ca7425bc8ffca4e00f19a8057cd14e4d (diff)
mfd: Convert WM8400 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm8400-core.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 62b4626f4561..2204893444a6 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -344,7 +344,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
344 struct wm8400 *wm8400; 344 struct wm8400 *wm8400;
345 int ret; 345 int ret;
346 346
347 wm8400 = kzalloc(sizeof(struct wm8400), GFP_KERNEL); 347 wm8400 = devm_kzalloc(&i2c->dev, sizeof(struct wm8400), GFP_KERNEL);
348 if (wm8400 == NULL) { 348 if (wm8400 == NULL) {
349 ret = -ENOMEM; 349 ret = -ENOMEM;
350 goto err; 350 goto err;
@@ -353,7 +353,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
353 wm8400->regmap = regmap_init_i2c(i2c, &wm8400_regmap_config); 353 wm8400->regmap = regmap_init_i2c(i2c, &wm8400_regmap_config);
354 if (IS_ERR(wm8400->regmap)) { 354 if (IS_ERR(wm8400->regmap)) {
355 ret = PTR_ERR(wm8400->regmap); 355 ret = PTR_ERR(wm8400->regmap);
356 goto struct_err; 356 goto err;
357 } 357 }
358 358
359 wm8400->dev = &i2c->dev; 359 wm8400->dev = &i2c->dev;
@@ -367,8 +367,6 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
367 367
368map_err: 368map_err:
369 regmap_exit(wm8400->regmap); 369 regmap_exit(wm8400->regmap);
370struct_err:
371 kfree(wm8400);
372err: 370err:
373 return ret; 371 return ret;
374} 372}
@@ -379,7 +377,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)
379 377
380 wm8400_release(wm8400); 378 wm8400_release(wm8400);
381 regmap_exit(wm8400->regmap); 379 regmap_exit(wm8400->regmap);
382 kfree(wm8400);
383 380
384 return 0; 381 return 0;
385} 382}