remoteproc: Restructure firmware name allocation
authorMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 20 Apr 2020 23:15:59 +0000 (17:15 -0600)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Tue, 21 Apr 2020 02:29:46 +0000 (19:29 -0700)
Improve the readability of function rproc_alloc_firmware() by using
a non-negated condition and moving the comment out of the conditional
block

Suggested-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20200420231601.16781-3-mathieu.poirier@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/remoteproc_core.c

index db8a15f..45529d4 100644 (file)
@@ -2011,14 +2011,14 @@ static int rproc_alloc_firmware(struct rproc *rproc,
 {
        const char *p;
 
-       if (!firmware)
-               /*
-                * If the caller didn't pass in a firmware name then
-                * construct a default name.
-                */
-               p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name);
-       else
+       /*
+        * Allocate a firmware name if the caller gave us one to work
+        * with.  Otherwise construct a new one using a default pattern.
+        */
+       if (firmware)
                p = kstrdup_const(firmware, GFP_KERNEL);
+       else
+               p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name);
 
        if (!p)
                return -ENOMEM;