diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-05-15 19:24:53 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-20 17:27:08 +0200 |
| commit | fa648e51f84d060ef991eeee4d7bacec45d7fbfd (patch) | |
| tree | 4e36211ddf91e03047eca30e9b37d508026441c6 /drivers/mfd/lm3533-core.c | |
| parent | 16e5e204c92800aad4e7db52d289565cc82240ce (diff) | |
mfd: Convert lm3533 to use devres
Use devres to manage core driver data and regmap.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/lm3533-core.c')
| -rw-r--r-- | drivers/mfd/lm3533-core.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c index 1627472ecc0..09019c65da1 100644 --- a/drivers/mfd/lm3533-core.c +++ b/drivers/mfd/lm3533-core.c @@ -603,33 +603,24 @@ static int __devinit lm3533_i2c_probe(struct i2c_client *i2c, dev_dbg(&i2c->dev, "%s\n", __func__); - lm3533 = kzalloc(sizeof(*lm3533), GFP_KERNEL); + lm3533 = devm_kzalloc(&i2c->dev, sizeof(*lm3533), GFP_KERNEL); if (!lm3533) return -ENOMEM; i2c_set_clientdata(i2c, lm3533); - lm3533->regmap = regmap_init_i2c(i2c, ®map_config); - if (IS_ERR(lm3533->regmap)) { - ret = PTR_ERR(lm3533->regmap); - goto err_regmap; - } + lm3533->regmap = devm_regmap_init_i2c(i2c, ®map_config); + if (IS_ERR(lm3533->regmap)) + return PTR_ERR(lm3533->regmap); lm3533->dev = &i2c->dev; lm3533->irq = i2c->irq; ret = lm3533_device_init(lm3533); if (ret) - goto err_dev; + return ret; return 0; - -err_dev: - regmap_exit(lm3533->regmap); -err_regmap: - kfree(lm3533); - - return ret; } static int __devexit lm3533_i2c_remove(struct i2c_client *i2c) @@ -639,9 +630,6 @@ static int __devexit lm3533_i2c_remove(struct i2c_client *i2c) dev_dbg(&i2c->dev, "%s\n", __func__); lm3533_device_exit(lm3533); - regmap_exit(lm3533->regmap); - - kfree(lm3533); return 0; } |