From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com
Cc: s-anna@ti.com, elder@linaro.org, Markus.Elfring@web.de,
linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 7/7] remoteproc: Get rid of tedious error path
Date: Wed, 15 Apr 2020 14:48:58 -0600 [thread overview]
Message-ID: <20200415204858.2448-8-mathieu.poirier@linaro.org> (raw)
Message-ID: <20200415204858.AIzCe5MB0wiQWx92b-KIb44riruVxsG9sCGqDmNhdv8@z> (raw)
In-Reply-To: <20200415204858.2448-1-mathieu.poirier@linaro.org>
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@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
---
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 a5a0ceb86b3f..405c94f151a7 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2056,12 +2056,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;
@@ -2074,12 +2068,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);
@@ -2100,11 +2099,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);
+put_device:
+ put_device(&rproc->dev);
return NULL;
}
EXPORT_SYMBOL(rproc_alloc);
--
2.20.1
next prev parent reply other threads:[~2020-04-15 20:49 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 20:48 [PATCH v2 0/7] remoteproc: Refactor function rproc_alloc() Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-15 20:48 ` [PATCH v2 1/7] remoteproc: Fix IDR initialisation in rproc_alloc() Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-17 13:37 ` Suman Anna
2020-04-17 13:37 ` Suman Anna
2020-04-20 5:00 ` Bjorn Andersson
2020-04-20 5:00 ` Bjorn Andersson
2020-04-15 20:48 ` [PATCH v2 2/7] remoteproc: Split firmware name allocation from rproc_alloc() Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-15 21:28 ` Alex Elder
2020-04-15 21:28 ` Alex Elder
2020-04-20 5:09 ` Bjorn Andersson
2020-04-20 5:09 ` Bjorn Andersson
2020-04-20 9:24 ` Arnaud POULIQUEN
2020-04-20 9:24 ` Arnaud POULIQUEN
2020-04-20 21:29 ` Mathieu Poirier
2020-04-20 21:29 ` Mathieu Poirier
2020-04-15 20:48 ` [PATCH v2 3/7] remoteproc: Simplify default name allocation Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-15 21:26 ` Alex Elder
2020-04-15 21:26 ` Alex Elder
2020-04-20 5:10 ` Bjorn Andersson
2020-04-20 5:10 ` Bjorn Andersson
2020-04-15 20:48 ` [PATCH v2 4/7] remoteproc: Use kstrdup_const() rather than kstrup() Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-15 21:25 ` Alex Elder
2020-04-15 21:25 ` Alex Elder
2020-04-17 13:44 ` Suman Anna
2020-04-17 13:44 ` Suman Anna
2020-04-20 5:21 ` Bjorn Andersson
2020-04-20 5:21 ` Bjorn Andersson
2020-04-17 16:12 ` [v2 4/7] remoteproc: Use kstrdup_const() rather than kstrdup() Markus Elfring
2020-04-17 16:12 ` Markus Elfring
2020-04-15 20:48 ` [PATCH v2 5/7] remoteproc: Restructure firmware name allocation Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-15 21:23 ` Alex Elder
2020-04-15 21:23 ` Alex Elder
2020-04-20 5:17 ` Bjorn Andersson
2020-04-20 5:17 ` Bjorn Andersson
2020-04-16 6:26 ` Markus Elfring
2020-04-16 6:26 ` Markus Elfring
2020-04-17 13:39 ` Suman Anna
2020-04-17 13:39 ` Suman Anna
2020-04-17 15:48 ` [v2 " Markus Elfring
2020-04-17 15:48 ` Markus Elfring
2020-04-17 16:15 ` Suman Anna
2020-04-17 16:15 ` Suman Anna
2020-04-17 20:58 ` Mathieu Poirier
2020-04-17 20:58 ` Mathieu Poirier
2020-04-17 21:28 ` [PATCH v2 " Mathieu Poirier
2020-04-17 21:28 ` Mathieu Poirier
2020-04-15 20:48 ` [PATCH v2 6/7] remoteproc: Split rproc_ops allocation from rproc_alloc() Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier
2020-04-17 13:49 ` Suman Anna
2020-04-17 13:49 ` Suman Anna
2020-04-17 15:35 ` Suman Anna
2020-04-17 15:35 ` Suman Anna
2020-04-17 21:56 ` Mathieu Poirier
2020-04-17 21:56 ` Mathieu Poirier
2020-04-15 20:48 ` Mathieu Poirier [this message]
2020-04-15 20:48 ` [PATCH v2 7/7] remoteproc: Get rid of tedious error path Mathieu Poirier
2020-04-17 13:50 ` Suman Anna
2020-04-17 13:50 ` Suman Anna
2020-04-17 13:34 ` [PATCH v2 0/7] remoteproc: Refactor function rproc_alloc() Suman Anna
2020-04-17 13:34 ` Suman Anna
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415204858.2448-8-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=Markus.Elfring@web.de \
--cc=bjorn.andersson@linaro.org \
--cc=elder@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=s-anna@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).