renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-26 19:44:21 +08:00
Code

mfd: tc3589x: Use devm_*() functions

Browse Source 
Use devm_*() functions to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Jingoo Han 2013-02-20 18:31:52 +09:00 committed by Samuel Ortiz
parent aa4dcf5bec
commit 1383e00f79
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mfd/tc3589x.c
View File

@ -350,7 +350,8 @@ static int tc3589x_probe(struct i2c_client *i2c,
| I2C_FUNC_SMBUS_I2C_BLOCK)) | I2C_FUNC_SMBUS_I2C_BLOCK))
return -EIO; return -EIO;
tc3589x = kzalloc(sizeof(struct tc3589x), GFP_KERNEL); tc3589x = devm_kzalloc(&i2c->dev, sizeof(struct tc3589x),
GFP_KERNEL);
if (!tc3589x) if (!tc3589x)
return -ENOMEM; return -ENOMEM;
@ -366,33 +367,27 @@ static int tc3589x_probe(struct i2c_client *i2c,
ret = tc3589x_chip_init(tc3589x); ret = tc3589x_chip_init(tc3589x);
if (ret) if (ret)
goto out_free; return ret;
ret = tc3589x_irq_init(tc3589x, np); ret = tc3589x_irq_init(tc3589x, np);
if (ret) if (ret)
goto out_free; return ret;
ret = request_threaded_irq(tc3589x->i2c->irq, NULL, tc3589x_irq, ret = request_threaded_irq(tc3589x->i2c->irq, NULL, tc3589x_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"tc3589x", tc3589x); "tc3589x", tc3589x);
if (ret) { if (ret) {
dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret); dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);
goto out_free; return ret;
} }
ret = tc3589x_device_init(tc3589x); ret = tc3589x_device_init(tc3589x);
if (ret) { if (ret) {
dev_err(tc3589x->dev, "failed to add child devices\n"); dev_err(tc3589x->dev, "failed to add child devices\n");
goto out_freeirq; return ret;
} }
return 0; return 0;
out_freeirq:
free_irq(tc3589x->i2c->irq, tc3589x);
out_free:
kfree(tc3589x);
return ret;
} }
static int tc3589x_remove(struct i2c_client *client) static int tc3589x_remove(struct i2c_client *client)
@ -401,10 +396,6 @@ static int tc3589x_remove(struct i2c_client *client)
mfd_remove_devices(tc3589x->dev); mfd_remove_devices(tc3589x->dev);
free_irq(tc3589x->i2c->irq, tc3589x);
kfree(tc3589x);
return 0; return 0;
} }