openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: bcm590xx: Use devm_mfd_add_devices() for mfd_device registration 

Use devm_mfd_add_devices() for MFD devices registration and get
rid of .remove callback to remove MFD child-devices. This is done
by managed device framework.

CC: Matt Porter <mporter@linaro.org>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Laxman Dewangan 2016-04-08 00:13:00 +05:30 committed by Lee Jones
parent f32fb9a593
commit 9148f2c018
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/bcm590xx.c
View File

@ -82,7 +82,7 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri,
goto err; goto err;
} }
ret = mfd_add_devices(&i2c_pri->dev, -1, bcm590xx_devs, ret = devm_mfd_add_devices(&i2c_pri->dev, -1, bcm590xx_devs,
ARRAY_SIZE(bcm590xx_devs), NULL, 0, NULL); ARRAY_SIZE(bcm590xx_devs), NULL, 0, NULL);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c_pri->dev, "failed to add sub-devices: %d\n", ret); dev_err(&i2c_pri->dev, "failed to add sub-devices: %d\n", ret);
@ -96,12 +96,6 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri,
return ret; return ret;
} }
static int bcm590xx_i2c_remove(struct i2c_client *i2c)
{
mfd_remove_devices(&i2c->dev);
return 0;
}
static const struct of_device_id bcm590xx_of_match[] = { static const struct of_device_id bcm590xx_of_match[] = {
{ .compatible = "brcm,bcm59056" }, { .compatible = "brcm,bcm59056" },
{ } { }
@ -120,7 +114,6 @@ static struct i2c_driver bcm590xx_i2c_driver = {
.of_match_table = of_match_ptr(bcm590xx_of_match), .of_match_table = of_match_ptr(bcm590xx_of_match),
}, },
.probe = bcm590xx_i2c_probe, .probe = bcm590xx_i2c_probe,
.remove = bcm590xx_i2c_remove,
.id_table = bcm590xx_i2c_id, .id_table = bcm590xx_i2c_id,
}; };
module_i2c_driver(bcm590xx_i2c_driver); module_i2c_driver(bcm590xx_i2c_driver);