diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 21:43:01 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 09:55:15 +0300 |
| commit | 9c384b0268c69a36e6b5d9c6b336fb81a63d457e (patch) | |
| tree | a3badabb67e82b33085e133d698cd42d722f15f5 /drivers/mfd/hi6421-pmic-core.c | |
| parent | 9148f2c01827fe1c8c8d589ac54b0f459759d78b (diff) | |
| download | linux-9c384b0268c69a36e6b5d9c6b336fb81a63d457e.tar.xz | |
mfd: hi6421-pmic: 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: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/hi6421-pmic-core.c')
| -rw-r--r-- | drivers/mfd/hi6421-pmic-core.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index f9ded45a992d..3fd703fe3aba 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -76,8 +76,8 @@ static int hi6421_pmic_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pmic); - ret = mfd_add_devices(&pdev->dev, 0, hi6421_devs, - ARRAY_SIZE(hi6421_devs), NULL, 0, NULL); + ret = devm_mfd_add_devices(&pdev->dev, 0, hi6421_devs, + ARRAY_SIZE(hi6421_devs), NULL, 0, NULL); if (ret) { dev_err(&pdev->dev, "add mfd devices failed: %d\n", ret); return ret; @@ -86,13 +86,6 @@ static int hi6421_pmic_probe(struct platform_device *pdev) return 0; } -static int hi6421_pmic_remove(struct platform_device *pdev) -{ - mfd_remove_devices(&pdev->dev); - - return 0; -} - static const struct of_device_id of_hi6421_pmic_match_tbl[] = { { .compatible = "hisilicon,hi6421-pmic", }, { }, @@ -105,7 +98,6 @@ static struct platform_driver hi6421_pmic_driver = { .of_match_table = of_hi6421_pmic_match_tbl, }, .probe = hi6421_pmic_probe, - .remove = hi6421_pmic_remove, }; module_platform_driver(hi6421_pmic_driver); |