Re: [PATCH v4 4/4] base/platform: Remove code duplication

[Rob Herring <robherring2@gmail.com>]

On Thu, Apr 23, 2015 at 8:58 AM, Ricardo Ribalda Delgado
<ricardo.ribalda@gmail.com> wrote:
> Failure path of platform_device_add was almost the same as
> platform_device_del. Refactor same code in a function.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Clean-ups should come first in the series. Otherwise:

Acked-by: Rob Herring <robh@kernel.org>

> ---
>  drivers/base/platform.c | 60 +++++++++++++++++++++----------------------------
>  1 file changed, 25 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index 2e7e904..152d84d 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -298,6 +298,25 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
>  }
>  EXPORT_SYMBOL_GPL(platform_device_add_data);
>
> +static void platform_device_cleanout(struct platform_device *pdev, int n_res)
> +{
> +       int i;
> +
> +       if (pdev->id_auto) {
> +               ida_simple_remove(&platform_devid_ida, pdev->id);
> +               pdev->id = PLATFORM_DEVID_AUTO;
> +       }
> +
> +       for (i = 0; i < n_res; i++) {
> +               struct resource *r = &pdev->resource[i];
> +               unsigned long type = resource_type(r);
> +
> +               if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
> +                               r->parent)
> +                       release_resource(r);
> +       }
> +}
> +
>  /**
>   * platform_device_add - add a platform device to device hierarchy
>   * @pdev: platform device we're adding
> @@ -371,23 +390,8 @@ int platform_device_add(struct platform_device *pdev)
>                  dev_name(&pdev->dev), dev_name(pdev->dev.parent));
>
>         ret = device_add(&pdev->dev);
> -       if (ret == 0)
> -               return ret;
> -
> -       /* Failure path */
> -       if (pdev->id_auto) {
> -               ida_simple_remove(&platform_devid_ida, pdev->id);
> -               pdev->id = PLATFORM_DEVID_AUTO;
> -       }
> -
> -       while (--i >= 0) {
> -               struct resource *r = &pdev->resource[i];
> -               unsigned long type = resource_type(r);
> -
> -               if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
> -                               r->parent)
> -                       release_resource(r);
> -       }
> +       if (ret)
> +               platform_device_cleanout(pdev, i);
>
>         return ret;
>  }
> @@ -403,25 +407,11 @@ EXPORT_SYMBOL_GPL(platform_device_add);
>   */
>  void platform_device_del(struct platform_device *pdev)
>  {
> -       int i;
> -
> -       if (pdev) {
> -               device_del(&pdev->dev);
> -
> -               if (pdev->id_auto) {
> -                       ida_simple_remove(&platform_devid_ida, pdev->id);
> -                       pdev->id = PLATFORM_DEVID_AUTO;
> -               }
> -
> -               for (i = 0; i < pdev->num_resources; i++) {
> -                       struct resource *r = &pdev->resource[i];
> -                       unsigned long type = resource_type(r);
> +       if (!pdev)
> +               return;
>
> -                       if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
> -                                       r->parent)
> -                               release_resource(r);
> -               }
> -       }
> +       device_del(&pdev->dev);
> +       platform_device_cleanout(pdev, pdev->num_resources);
>  }
>  EXPORT_SYMBOL_GPL(platform_device_del);
>
> --
> 2.1.4
>