Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: Convert lm3533 to use devres

Browse Source 
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>
This commit is contained in:
Johan Hovold 2012-05-15 19:24:53 +02:00 committed by Samuel Ortiz
parent 16e5e204c9
commit fa648e51f8
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mfd/lm3533-core.c
View File

@ -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, &regmap_config);
if (IS_ERR(lm3533->regmap)) {
ret = PTR_ERR(lm3533->regmap);
goto err_regmap;
}
lm3533->regmap = devm_regmap_init_i2c(i2c, &regmap_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;
}