diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-03 21:43:04 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-01-09 00:37:39 +0100 |
| commit | f57723457045eb281dcf8d364d1c7292d242ff68 (patch) | |
| tree | 88264ab11ea0fb2fff504918e5795f7acefc56e3 /drivers/mfd | |
| parent | ee66e653ca7425bc8ffca4e00f19a8057cd14e4d (diff) | |
| download | op-kernel-dev-f57723457045eb281dcf8d364d1c7292d242ff68.zip op-kernel-dev-f57723457045eb281dcf8d364d1c7292d242ff68.tar.gz | |
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.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 62b4626..2204893 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, 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; @@ -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; @@ -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; } @@ -379,7 +377,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c) wm8400_release(wm8400); regmap_exit(wm8400->regmap); - kfree(wm8400); return 0; } |
