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>
---
drivers/remoteproc/remoteproc_core.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index d22e557f27ed..ee277bc5556c 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2054,12 +2054,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;
@@ -2070,12 +2064,17 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
rproc->dev.class = &rproc_class;
rproc->dev.driver_data = rproc;
+ if (rproc_alloc_firmware(rproc, name, firmware))
+ goto out;
+
+ if (rproc_alloc_ops(rproc, ops))
+ goto out;
+
/* 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 out;
}
dev_set_name(&rproc->dev, "remoteproc%d", rproc->index);
@@ -2098,11 +2097,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
rproc->state = RPROC_OFFLINE;
return rproc;
-
-free_firmware:
- kfree(rproc->firmware);
-free_rproc:
- kfree(rproc);
+out:
+ put_device(&rproc->dev);
return NULL;
}
EXPORT_SYMBOL(rproc_alloc);
--
2.20.1
