summaryrefslogtreecommitdiff
path: root/drivers/mfd/wl1273-core.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-20 16:06:17 +0900
committerLee Jones <lee.jones@linaro.org>2013-08-20 08:51:58 +0100
commitbba078273e259c7eff729ac00a1476987ad5413a (patch)
treee59631ae7a1c9828eca48375d68b509beb9dfebb /drivers/mfd/wl1273-core.c
parenteac1dcbd3e211998fb8342902b3acee149a9271d (diff)
mfd: wl1273: 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/wl1273-core.c')
-rw-r--r--drivers/mfd/wl1273-core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 1288e9943f01..f7c52d901040 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -172,12 +172,9 @@ static int wl1273_fm_set_volume(struct wl1273_core *core, unsigned int volume)
static int wl1273_core_remove(struct i2c_client *client)
{
- struct wl1273_core *core = i2c_get_clientdata(client);
-
dev_dbg(&client->dev, "%s\n", __func__);
mfd_remove_devices(&client->dev);
- kfree(core);
return 0;
}
@@ -203,7 +200,7 @@ static int wl1273_core_probe(struct i2c_client *client,
return -EINVAL;
}
- core = kzalloc(sizeof(*core), GFP_KERNEL);
+ core = devm_kzalloc(&client->dev, sizeof(*core), GFP_KERNEL);
if (!core)
return -ENOMEM;
@@ -249,7 +246,6 @@ static int wl1273_core_probe(struct i2c_client *client,
err:
pdata->free_resources();
- kfree(core);
dev_dbg(&client->dev, "%s\n", __func__);