summaryrefslogtreecommitdiff
path: root/drivers/remoteproc
diff options
context:
space:
mode:
authorMathieu Poirier <mathieu.poirier@linaro.org>2020-04-15 23:48:54 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2020-04-20 08:24:54 +0300
commit4df4f8be8b3e9ce807ba47c030893d711abe6ee3 (patch)
tree406ade534939dfd98f76d8366fd94370c0b44c41 /drivers/remoteproc
parent0c2ae2b1afdfffa5e485614569d2ff12dee97fc5 (diff)
downloadlinux-4df4f8be8b3e9ce807ba47c030893d711abe6ee3.tar.xz
remoteproc: Simplify default name allocation
In an effort to cleanup firmware name allocation, replace the cumbersome mechanic used to allocate a default firmware name with function kasprintf(). Reviewed-by: Alex Elder <elder@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Suggested-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200415204858.2448-4-mathieu.poirier@linaro.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r--drivers/remoteproc/remoteproc_core.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 4dee63f319ba..9899467fa1cf 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1982,24 +1982,19 @@ static const struct device_type rproc_type = {
static int rproc_alloc_firmware(struct rproc *rproc,
const char *name, const char *firmware)
{
- char *p, *template = "rproc-%s-fw";
- int name_len;
+ char *p;
- if (!firmware) {
+ if (!firmware)
/*
* If the caller didn't pass in a firmware name then
* construct a default name.
*/
- name_len = strlen(name) + strlen(template) - 2 + 1;
- p = kmalloc(name_len, GFP_KERNEL);
- if (!p)
- return -ENOMEM;
- snprintf(p, name_len, template, name);
- } else {
+ p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name);
+ else
p = kstrdup(firmware, GFP_KERNEL);
- if (!p)
- return -ENOMEM;
- }
+
+ if (!p)
+ return -ENOMEM;
rproc->firmware = p;