Re: [PATCH V2 10/20] mfd: mt6397: Use devm_mfd_add_devices() for mfd_device registration

Lee Jones
2016-04-11T09:31:18Z

Applied, thanks.

On Fri, 08 Apr 2016, Laxman Dewangan wrote:

> 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.
>
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: John Crispin <blogic@openwrt.org>
> CC: Javier Martinez Canillas <javier@osg.samsung.com>
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>
> ---
> Changes from V1:
> - Convert mfd to MFD.
> - Collected reviewed by.
>
> drivers/mfd/mt6397-core.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index 8e8d932..5a3ffa3 100644
> --- 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),

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog