On Mon 20 Apr 16:16 PDT 2020, Mathieu Poirier wrote:
> Get rid of tedious error management by moving firmware and operation
> allocation after calling device_initialize(). That way we take advantage
> of the automatic call to rproc_type_release() to cleanup after ourselves
> when put_device() is called.
>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Reviewed-by: Alex Elder <elder@xxxxxxxxxx>
> Acked-by: Suman Anna <s-anna@xxxxxx>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> drivers/remoteproc/remoteproc_core.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 15318507aedb..6fca4e2c0dd7 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -2084,12 +2084,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
> if (!rproc)
> return NULL;
>
> - if (rproc_alloc_firmware(rproc, name, firmware))
> - goto free_rproc;
> -
> - if (rproc_alloc_ops(rproc, ops))
> - goto free_firmware;
> -
> rproc->name = name;
> rproc->priv = &rproc[1];
> rproc->auto_boot = true;
> @@ -2103,12 +2097,17 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
> rproc->dev.driver_data = rproc;
> idr_init(&rproc->notifyids);
>
> + if (rproc_alloc_firmware(rproc, name, firmware))
> + goto put_device;
> +
> + if (rproc_alloc_ops(rproc, ops))
> + goto put_device;
> +
> /* Assign a unique device index and name */
> rproc->index = ida_simple_get(&rproc_dev_index, 0, 0, GFP_KERNEL);
> if (rproc->index < 0) {
> dev_err(dev, "ida_simple_get failed: %d\n", rproc->index);
> - put_device(&rproc->dev);
> - return NULL;
> + goto put_device;
> }
>
> dev_set_name(&rproc->dev, "remoteproc%d", rproc->index);
> @@ -2130,10 +2129,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
>
> return rproc;
>
> -free_firmware:
> - kfree_const(rproc->firmware);
> -free_rproc:
> - kfree(rproc);
> +put_device:
> + put_device(&rproc->dev);
> return NULL;
> }
> EXPORT_SYMBOL(rproc_alloc);
> --
> 2.20.1
>
