mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
mfd: tc3589x: Use devm_*() functions
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:
parent
aa4dcf5bec
commit
1383e00f79
@ -350,7 +350,8 @@ static int tc3589x_probe(struct i2c_client *i2c,
|
||||
| I2C_FUNC_SMBUS_I2C_BLOCK))
|
||||
return -EIO;
|
||||
|
||||
tc3589x = kzalloc(sizeof(struct tc3589x), GFP_KERNEL);
|
||||
tc3589x = devm_kzalloc(&i2c->dev, sizeof(struct tc3589x),
|
||||
GFP_KERNEL);
|
||||
if (!tc3589x)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -366,33 +367,27 @@ static int tc3589x_probe(struct i2c_client *i2c,
|
||||
|
||||
ret = tc3589x_chip_init(tc3589x);
|
||||
if (ret)
|
||||
goto out_free;
|
||||
return ret;
|
||||
|
||||
ret = tc3589x_irq_init(tc3589x, np);
|
||||
if (ret)
|
||||
goto out_free;
|
||||
return ret;
|
||||
|
||||
ret = request_threaded_irq(tc3589x->i2c->irq, NULL, tc3589x_irq,
|
||||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
|
||||
"tc3589x", tc3589x);
|
||||
if (ret) {
|
||||
dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);
|
||||
goto out_free;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = tc3589x_device_init(tc3589x);
|
||||
if (ret) {
|
||||
dev_err(tc3589x->dev, "failed to add child devices\n");
|
||||
goto out_freeirq;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out_freeirq:
|
||||
free_irq(tc3589x->i2c->irq, tc3589x);
|
||||
out_free:
|
||||
kfree(tc3589x);
|
||||
return ret;
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
free_irq(tc3589x->i2c->irq, tc3589x);
|
||||
|
||||
kfree(tc3589x);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user