mfd: mt6397: 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: John Crispin <blogic@openwrt.org>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 8e8d93249c09794829f148bfa0428581082dd06b..5a3ffa391942312846149db15544d318c91b7ff4 100644 (file)
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -276,8 +276,9 @@ static int mt6397_probe(struct platform_device *pdev)
                pmic->int_con[1] = MT6323_INT_CON1;
                pmic->int_status[0] = MT6323_INT_STATUS0;
                pmic->int_status[1] = MT6323_INT_STATUS1;
-               ret = mfd_add_devices(&pdev->dev, -1, mt6323_devs,
-                               ARRAY_SIZE(mt6323_devs), NULL, 0, NULL);
+               ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs,
+                                          ARRAY_SIZE(mt6323_devs), NULL,
+                                          0, NULL);
                break;
 
        case MT6397_CID_CODE:
@@ -286,8 +287,9 @@ static int mt6397_probe(struct platform_device *pdev)
                pmic->int_con[1] = MT6397_INT_CON1;
                pmic->int_status[0] = MT6397_INT_STATUS0;
                pmic->int_status[1] = MT6397_INT_STATUS1;
-               ret = mfd_add_devices(&pdev->dev, -1, mt6397_devs,
-                               ARRAY_SIZE(mt6397_devs), NULL, 0, NULL);
+               ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs,
+                                          ARRAY_SIZE(mt6397_devs), NULL,
+                                          0, NULL);
                break;
 
        default:
@@ -312,13 +314,6 @@ fail_irq:
        return ret;
 }
 
-static int mt6397_remove(struct platform_device *pdev)
-{
-       mfd_remove_devices(&pdev->dev);
-
-       return 0;
-}
-
 static const struct of_device_id mt6397_of_match[] = {
        { .compatible = "mediatek,mt6397" },
        { .compatible = "mediatek,mt6323" },
@@ -334,7 +329,6 @@ MODULE_DEVICE_TABLE(platform, mt6397_id);
 
 static struct platform_driver mt6397_driver = {
        .probe = mt6397_probe,
-       .remove = mt6397_remove,
        .driver = {
                .name = "mt6397",
                .of_match_table = of_match_ptr(mt6397_of_match),