Re: [PATCH V2 14/20] mfd: rt5033: 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: Ingi Kim <ingi2.kim@xxxxxxxxxxx>
> CC: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
> Reviewed-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
> 
> ---
> Changes from V1:
> - Convert mfd to MFD.
> - Run checkpatch with --strict option and fix warning.
> - Collected reviewed by.
> 
>  drivers/mfd/rt5033.c | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c
> index 2b95485..9bd089c 100644
> --- a/drivers/mfd/rt5033.c
> +++ b/drivers/mfd/rt5033.c
> @@ -97,9 +97,9 @@ static int rt5033_i2c_probe(struct i2c_client *i2c,
>  		return ret;
>  	}
>  
> -	ret = mfd_add_devices(rt5033->dev, -1, rt5033_devs,
> -			ARRAY_SIZE(rt5033_devs), NULL, 0,
> -			regmap_irq_get_domain(rt5033->irq_data));
> +	ret = devm_mfd_add_devices(rt5033->dev, -1, rt5033_devs,
> +				   ARRAY_SIZE(rt5033_devs), NULL, 0,
> +				   regmap_irq_get_domain(rt5033->irq_data));
>  	if (ret < 0) {
>  		dev_err(&i2c->dev, "Failed to add RT5033 child devices.\n");
>  		return ret;
> @@ -110,13 +110,6 @@ static int rt5033_i2c_probe(struct i2c_client *i2c,
>  	return 0;
>  }
>  
> -static int rt5033_i2c_remove(struct i2c_client *i2c)
> -{
> -	mfd_remove_devices(&i2c->dev);
> -
> -	return 0;
> -}
> -
>  static const struct i2c_device_id rt5033_i2c_id[] = {
>  	{ "rt5033", },
>  	{ }
> @@ -135,7 +128,6 @@ static struct i2c_driver rt5033_driver = {
>  		.of_match_table = of_match_ptr(rt5033_dt_match),
>  	},
>  	.probe = rt5033_i2c_probe,
> -	.remove = rt5033_i2c_remove,
>  	.id_table = rt5033_i2c_id,
>  };
>  module_i2c_driver(rt5033_driver);

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