diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-08-20 16:05:54 +0900 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-08-20 08:51:48 +0100 |
| commit | eac1dcbd3e211998fb8342902b3acee149a9271d (patch) | |
| tree | 6de0e97cfda381be518d0bde498abaa3be072d28 /drivers/mfd | |
| parent | 7a4043112778c8ba7169b3006c8b7789213c878a (diff) | |
| download | linux-eac1dcbd3e211998fb8342902b3acee149a9271d.tar.bz2 | |
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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps65010.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index 8114567e0695..743fb524fc8a 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c @@ -530,7 +530,6 @@ static int __exit tps65010_remove(struct i2c_client *client) free_irq(client->irq, tps); cancel_delayed_work_sync(&tps->work); debugfs_remove(tps->file); - kfree(tps); the_tps = NULL; 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)) return -EINVAL; - tps = kzalloc(sizeof *tps, GFP_KERNEL); + tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL); if (!tps) return -ENOMEM; @@ -568,7 +567,7 @@ static int tps65010_probe(struct i2c_client *client, if (status < 0) { dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", client->irq, status); - goto fail1; + return status; } /* annoying race here, ideally we'd have an option * to claim the irq now and enable it later. @@ -668,9 +667,6 @@ static int tps65010_probe(struct i2c_client *client, } return 0; -fail1: - kfree(tps); - return status; } static const struct i2c_device_id tps65010_id[] = { |