public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mfd: da9063: Replace mfd_add_devices with devm counterpart

Browse source 
Use devm_mfd_add_devices() instead of plain mfd_add_devices(), which
removes the need for da9063_device_exit() altogether and also for the
.remove callback in da9063-i2c.c .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Marek Vasut 2018-06-11 13:58:39 +02:00 • committed by Lee Jones
parent 7494de0454
commit af8df94587
3 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/mfd/da9063-core.c
View file

@ -226,20 +226,15 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
da9063->irq_base = regmap_irq_chip_get_base(da9063->regmap_irq); da9063->irq_base = regmap_irq_chip_get_base(da9063->regmap_irq);
ret = mfd_add_devices(da9063->dev, -1, da9063_devs, ret = devm_mfd_add_devices(da9063->dev, -1, da9063_devs,
ARRAY_SIZE(da9063_devs), NULL, da9063->irq_base, ARRAY_SIZE(da9063_devs), NULL,
NULL); da9063->irq_base, NULL);
if (ret) if (ret)
dev_err(da9063->dev, "Cannot add MFD cells\n"); dev_err(da9063->dev, "Cannot add MFD cells\n");
return ret; return ret;
} }
void da9063_device_exit(struct da9063 *da9063)
{
mfd_remove_devices(da9063->dev);
}
MODULE_DESCRIPTION("PMIC driver for Dialog DA9063"); MODULE_DESCRIPTION("PMIC driver for Dialog DA9063");
MODULE_AUTHOR("Krystian Garbaciak"); MODULE_AUTHOR("Krystian Garbaciak");
MODULE_AUTHOR("Michal Hajduk"); MODULE_AUTHOR("Michal Hajduk");

10
drivers/mfd/da9063-i2c.c
View file

@ -270,15 +270,6 @@ static int da9063_i2c_probe(struct i2c_client *i2c,
return da9063_device_init(da9063, i2c->irq); return da9063_device_init(da9063, i2c->irq);
} }
static int da9063_i2c_remove(struct i2c_client *i2c)
{
struct da9063 *da9063 = i2c_get_clientdata(i2c);
da9063_device_exit(da9063);
return 0;
}
static const struct i2c_device_id da9063_i2c_id[] = { static const struct i2c_device_id da9063_i2c_id[] = {
{"da9063", PMIC_DA9063}, {"da9063", PMIC_DA9063},
{}, {},
@ -291,7 +282,6 @@ static struct i2c_driver da9063_i2c_driver = {
.of_match_table = of_match_ptr(da9063_dt_ids), .of_match_table = of_match_ptr(da9063_dt_ids),
}, },
.probe = da9063_i2c_probe, .probe = da9063_i2c_probe,
.remove = da9063_i2c_remove,
.id_table = da9063_i2c_id, .id_table = da9063_i2c_id,
}; };

2
include/linux/mfd/da9063/core.h
View file

@ -94,6 +94,4 @@ struct da9063 {
int da9063_device_init(struct da9063 *da9063, unsigned int irq); int da9063_device_init(struct da9063 *da9063, unsigned int irq);
int da9063_irq_init(struct da9063 *da9063); int da9063_irq_init(struct da9063 *da9063);
void da9063_device_exit(struct da9063 *da9063);
#endif /* __MFD_DA9063_CORE_H__ */ #endif /* __MFD_DA9063_CORE_H__ */