Re: [PATCH V2 07/20] mfd: hi6421-pmic: Use devm_mfd_add_devices() for mfd_device registration

[Lee Jones]

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@xxxxxxxxxx>
> CC: Guodong Xu <guodong.xu@xxxxxxxxxx>
> 
> ---
> Changes from V1:
> - Convert mfd to MFD.
> - Run checkpatch with --strict option and fix warning.
> 
>  drivers/mfd/hi6421-pmic-core.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c
> index f9ded45..3fd703f 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);
>  

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