diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-08 00:13:06 +0530 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 07:55:59 +0100 |
| commit | d5623161accbc567452700add15d76fc092b07fe (patch) | |
| tree | 922e05940096aeba66cb0bbc1f1609f28f6fd1be /drivers/mfd/rk808.c | |
| parent | 7360544c2b91d5689b635b2117f5e85986cf529b (diff) | |
| download | talos-op-linux-d5623161accbc567452700add15d76fc092b07fe.tar.gz talos-op-linux-d5623161accbc567452700add15d76fc092b07fe.zip | |
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>
Diffstat (limited to 'drivers/mfd/rk808.c')
| -rw-r--r-- | drivers/mfd/rk808.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index 4b1e4399754b..49d7f624fc94 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -213,9 +213,9 @@ static int rk808_probe(struct i2c_client *client, rk808->i2c = client; i2c_set_clientdata(client, rk808); - ret = mfd_add_devices(&client->dev, -1, - rk808s, ARRAY_SIZE(rk808s), - NULL, 0, regmap_irq_get_domain(rk808->irq_data)); + ret = devm_mfd_add_devices(&client->dev, -1, + rk808s, ARRAY_SIZE(rk808s), NULL, 0, + regmap_irq_get_domain(rk808->irq_data)); if (ret) { dev_err(&client->dev, "failed to add MFD devices %d\n", ret); goto err_irq; @@ -240,7 +240,6 @@ static int rk808_remove(struct i2c_client *client) struct rk808 *rk808 = i2c_get_clientdata(client); regmap_del_irq_chip(client->irq, rk808->irq_data); - mfd_remove_devices(&client->dev); pm_power_off = NULL; return 0; |
