1
0
Fork 0

mfd: menf21bmc: 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.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Andreas Werner <andreas.werner@men.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
steinar/wifi_calib_4_9_kernel
Laxman Dewangan 2016-04-08 00:13:03 +05:30 committed by Lee Jones
parent c5f2445494
commit 7990ad17a9
1 changed files with 2 additions and 9 deletions

View File

@ -96,8 +96,8 @@ menf21bmc_probe(struct i2c_client *client, const struct i2c_device_id *ids)
return ret; return ret;
} }
ret = mfd_add_devices(&client->dev, 0, menf21bmc_cell, ret = devm_mfd_add_devices(&client->dev, 0, menf21bmc_cell,
ARRAY_SIZE(menf21bmc_cell), NULL, 0, NULL); ARRAY_SIZE(menf21bmc_cell), NULL, 0, NULL);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "failed to add BMC sub-devices\n"); dev_err(&client->dev, "failed to add BMC sub-devices\n");
return ret; return ret;
@ -106,12 +106,6 @@ menf21bmc_probe(struct i2c_client *client, const struct i2c_device_id *ids)
return 0; return 0;
} }
static int menf21bmc_remove(struct i2c_client *client)
{
mfd_remove_devices(&client->dev);
return 0;
}
static const struct i2c_device_id menf21bmc_id_table[] = { static const struct i2c_device_id menf21bmc_id_table[] = {
{ "menf21bmc" }, { "menf21bmc" },
{ } { }
@ -122,7 +116,6 @@ static struct i2c_driver menf21bmc_driver = {
.driver.name = "menf21bmc", .driver.name = "menf21bmc",
.id_table = menf21bmc_id_table, .id_table = menf21bmc_id_table,
.probe = menf21bmc_probe, .probe = menf21bmc_probe,
.remove = menf21bmc_remove,
}; };
module_i2c_driver(menf21bmc_driver); module_i2c_driver(menf21bmc_driver);