Skip to content

Commit

Permalink
mfd: Convert WM8400 to devm_kzalloc()
Browse files Browse the repository at this point in the history 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Jan 8, 2012
1 parent ee66e65 commit f577234
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/mfd/wm8400-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
struct wm8400 *wm8400;
int ret;

wm8400 = kzalloc(sizeof(struct wm8400), GFP_KERNEL);
wm8400 = devm_kzalloc(&i2c->dev, sizeof(struct wm8400), GFP_KERNEL);
if (wm8400 == NULL) {
ret = -ENOMEM;
goto err;
Expand All @@ -353,7 +353,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
wm8400->regmap = regmap_init_i2c(i2c, &wm8400_regmap_config);
if (IS_ERR(wm8400->regmap)) {
ret = PTR_ERR(wm8400->regmap);
goto struct_err;
goto err;
}

wm8400->dev = &i2c->dev;
Expand All @@ -367,8 +367,6 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,

map_err:
regmap_exit(wm8400->regmap);
struct_err:
kfree(wm8400);
err:
return ret;
}
Expand All @@ -379,7 +377,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)

wm8400_release(wm8400);
regmap_exit(wm8400->regmap);
kfree(wm8400);

return 0;
}
Expand Down

0 comments on commit f577234

Please sign in to comment.