|
@@ -276,8 +276,9 @@ static int mt6397_probe(struct platform_device *pdev)
|
|
|
pmic->int_con[1] = MT6323_INT_CON1;
|
|
pmic->int_con[1] = MT6323_INT_CON1;
|
|
|
pmic->int_status[0] = MT6323_INT_STATUS0;
|
|
pmic->int_status[0] = MT6323_INT_STATUS0;
|
|
|
pmic->int_status[1] = MT6323_INT_STATUS1;
|
|
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;
|
|
break;
|
|
|
|
|
|
|
|
case MT6397_CID_CODE:
|
|
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_con[1] = MT6397_INT_CON1;
|
|
|
pmic->int_status[0] = MT6397_INT_STATUS0;
|
|
pmic->int_status[0] = MT6397_INT_STATUS0;
|
|
|
pmic->int_status[1] = MT6397_INT_STATUS1;
|
|
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;
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
default:
|
|
@@ -312,13 +314,6 @@ fail_irq:
|
|
|
return ret;
|
|
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[] = {
|
|
static const struct of_device_id mt6397_of_match[] = {
|
|
|
{ .compatible = "mediatek,mt6397" },
|
|
{ .compatible = "mediatek,mt6397" },
|
|
|
{ .compatible = "mediatek,mt6323" },
|
|
{ .compatible = "mediatek,mt6323" },
|
|
@@ -334,7 +329,6 @@ MODULE_DEVICE_TABLE(platform, mt6397_id);
|
|
|
|
|
|
|
|
static struct platform_driver mt6397_driver = {
|
|
static struct platform_driver mt6397_driver = {
|
|
|
.probe = mt6397_probe,
|
|
.probe = mt6397_probe,
|
|
|
- .remove = mt6397_remove,
|
|
|
|
|
.driver = {
|
|
.driver = {
|
|
|
.name = "mt6397",
|
|
.name = "mt6397",
|
|
|
.of_match_table = of_match_ptr(mt6397_of_match),
|
|
.of_match_table = of_match_ptr(mt6397_of_match),
|