Commit f9932c6e authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Lee Jones

mfd: act8945a: 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: Wenyou Yang <wenyou.yang@atmel.com>
CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 3698283b
...@@ -46,8 +46,9 @@ static int act8945a_i2c_probe(struct i2c_client *i2c, ...@@ -46,8 +46,9 @@ static int act8945a_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, regmap); i2c_set_clientdata(i2c, regmap);
ret = mfd_add_devices(&i2c->dev, PLATFORM_DEVID_NONE, act8945a_devs, ret = devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_NONE,
ARRAY_SIZE(act8945a_devs), NULL, 0, NULL); act8945a_devs, ARRAY_SIZE(act8945a_devs),
NULL, 0, NULL);
if (ret) { if (ret) {
dev_err(&i2c->dev, "Failed to add sub devices\n"); dev_err(&i2c->dev, "Failed to add sub devices\n");
return ret; return ret;
...@@ -56,13 +57,6 @@ static int act8945a_i2c_probe(struct i2c_client *i2c, ...@@ -56,13 +57,6 @@ static int act8945a_i2c_probe(struct i2c_client *i2c,
return 0; return 0;
} }
static int act8945a_i2c_remove(struct i2c_client *i2c)
{
mfd_remove_devices(&i2c->dev);
return 0;
}
static const struct i2c_device_id act8945a_i2c_id[] = { static const struct i2c_device_id act8945a_i2c_id[] = {
{ "act8945a", 0 }, { "act8945a", 0 },
{} {}
...@@ -81,7 +75,6 @@ static struct i2c_driver act8945a_i2c_driver = { ...@@ -81,7 +75,6 @@ static struct i2c_driver act8945a_i2c_driver = {
.of_match_table = of_match_ptr(act8945a_of_match), .of_match_table = of_match_ptr(act8945a_of_match),
}, },
.probe = act8945a_i2c_probe, .probe = act8945a_i2c_probe,
.remove = act8945a_i2c_remove,
.id_table = act8945a_i2c_id, .id_table = act8945a_i2c_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment