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

Lee Jones
2016-04-11T09:32:47Z

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: Mark Brown <broonie@kernel.org>
> CC: patches@opensource.wolfsonmicro.com
> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
>
> ---
> Changes from V1:
> - Convert mfd to MFD.
> - Collected acks.
>
> drivers/mfd/wm8400-core.c | 25 +++----------------------
> 1 file changed, 3 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
> index 3bd44a4..9fd8230 100644
> --- a/drivers/mfd/wm8400-core.c
> +++ b/drivers/mfd/wm8400-core.c
> @@ -70,7 +70,7 @@ static int wm8400_register_codec(struct wm8400 *wm8400)
> .pdata_size = sizeof(*wm8400),
> };
>
> - return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0, NULL);
> + return devm_mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0, NULL);
> }
>
> /*
> @@ -111,7 +111,7 @@ static int wm8400_init(struct wm8400 *wm8400,
> ret = wm8400_register_codec(wm8400);
> if (ret != 0) {
> dev_err(wm8400->dev, "Failed to register codec\n");
> - goto err_children;
> + return ret;
> }
>
> if (pdata && pdata->platform_init) {
> @@ -119,21 +119,12 @@ static int wm8400_init(struct wm8400 *wm8400,
> if (ret != 0) {
> dev_err(wm8400->dev, "Platform init failed: %d\n",
> ret);
> - goto err_children;
> + return ret;
> }
> } else
> dev_warn(wm8400->dev, "No platform initialisation supplied\n");
>
> return 0;
> -
> -err_children:
> - mfd_remove_devices(wm8400->dev);
> - return ret;
> -}
> -
> -static void wm8400_release(struct wm8400 *wm8400)
> -{
> - mfd_remove_devices(wm8400->dev);
> }
>
> static const struct regmap_config wm8400_regmap_config = {
> @@ -176,15 +167,6 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
> return wm8400_init(wm8400, dev_get_platdata(&i2c->dev));
> }
>
> -static int wm8400_i2c_remove(struct i2c_client *i2c)
> -{
> - struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
> -
> - wm8400_release(wm8400);
> -
> - return 0;
> -}
> -
> static const struct i2c_device_id wm8400_i2c_id[] = {
> { "wm8400", 0 },
> { }
> @@ -196,7 +178,6 @@ static struct i2c_driver wm8400_i2c_driver = {
> .name = "WM8400",
> },
> .probe = wm8400_i2c_probe,
> - .remove = wm8400_i2c_remove,
> .id_table = wm8400_i2c_id,
> };
> #endif

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