hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mfd: rk808: Use devm_mfd_add_devices() for mfd_device registration 

Use devm_mfd_add_devices() for MFD devices registration and remove
the call of mfd_remove_devices() from .remove callback to remove
MFD child-devices. This is done by managed device framework.

CC: Chris Zhong <zyw@rock-chips.com>
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:06 +05:30 committed by Lee Jones
parent 7360544c2b
commit d5623161ac
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mfd/rk808.c
View File

@ -213,9 +213,9 @@ static int rk808_probe(struct i2c_client *client,
rk808->i2c = client; rk808->i2c = client;
i2c_set_clientdata(client, rk808); i2c_set_clientdata(client, rk808);
ret = mfd_add_devices(&client->dev, -1, ret = devm_mfd_add_devices(&client->dev, -1,
rk808s, ARRAY_SIZE(rk808s), rk808s, ARRAY_SIZE(rk808s), NULL, 0,
NULL, 0, regmap_irq_get_domain(rk808->irq_data)); regmap_irq_get_domain(rk808->irq_data));
if (ret) { if (ret) {
dev_err(&client->dev, "failed to add MFD devices %d\n", ret); dev_err(&client->dev, "failed to add MFD devices %d\n", ret);
goto err_irq; goto err_irq;
@ -240,7 +240,6 @@ static int rk808_remove(struct i2c_client *client)
struct rk808 *rk808 = i2c_get_clientdata(client); struct rk808 *rk808 = i2c_get_clientdata(client);
regmap_del_irq_chip(client->irq, rk808->irq_data); regmap_del_irq_chip(client->irq, rk808->irq_data);
mfd_remove_devices(&client->dev);
pm_power_off = NULL; pm_power_off = NULL;
return 0; return 0;