openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: tps65010: 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>
This commit is contained in:
Jingoo Han 2013-08-20 16:05:54 +09:00 committed by Lee Jones
parent 7a40431127
commit eac1dcbd3e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mfd/tps65010.c
View File

@ -530,7 +530,6 @@ static int __exit tps65010_remove(struct i2c_client *client)
free_irq(client->irq, tps); free_irq(client->irq, tps);
cancel_delayed_work_sync(&tps->work); cancel_delayed_work_sync(&tps->work);
debugfs_remove(tps->file); debugfs_remove(tps->file);
kfree(tps);
the_tps = NULL; the_tps = NULL;
return 0; return 0;
} }
@ -550,7 +549,7 @@ static int tps65010_probe(struct i2c_client *client,
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EINVAL; return -EINVAL;
tps = kzalloc(sizeof *tps, GFP_KERNEL); tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
if (!tps) if (!tps)
return -ENOMEM; return -ENOMEM;
@ -568,7 +567,7 @@ static int tps65010_probe(struct i2c_client *client,
if (status < 0) { if (status < 0) {
dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
client->irq, status); client->irq, status);
goto fail1; return status;
} }
/* annoying race here, ideally we'd have an option /* annoying race here, ideally we'd have an option
* to claim the irq now and enable it later. * to claim the irq now and enable it later.
@ -668,9 +667,6 @@ static int tps65010_probe(struct i2c_client *client,
} }
return 0; return 0;
fail1:
kfree(tps);
return status;
} }
static const struct i2c_device_id tps65010_id[] = { static const struct i2c_device_id tps65010_id[] = {