From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: ohad@wizery.com, elder@linaro.org, s-anna@ti.com,
Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 4/4] remoteproc: Get rid of tedious error path
Date: Mon, 20 Apr 2020 19:01:10 -0700 [thread overview]
Message-ID: <20200421020107.GJ1868936@builder.lan> (raw)
In-Reply-To: <20200420231601.16781-5-mathieu.poirier@linaro.org>
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@linaro.org>
> Reviewed-by: Alex Elder <elder@linaro.org>
> Acked-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> 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
>
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: ohad@wizery.com, elder@linaro.org, s-anna@ti.com,
Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 4/4] remoteproc: Get rid of tedious error path
Date: Mon, 20 Apr 2020 19:01:07 -0700 [thread overview]
Message-ID: <20200421020107.GJ1868936@builder.lan> (raw)
Message-ID: <20200421020107.6ARwwkx8VwCrlgUcAbI1ZKRLsecbqnkC4r0ZbOIuy3o@z> (raw)
In-Reply-To: <20200420231601.16781-5-mathieu.poirier@linaro.org>
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@linaro.org>
> Reviewed-by: Alex Elder <elder@linaro.org>
> Acked-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> 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
>
next prev parent reply other threads:[~2020-04-21 2:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 23:15 [PATCH v3 0/4] remoteproc: Refactor function rproc_alloc() Mathieu Poirier
2020-04-20 23:15 ` [PATCH v3 1/4] remoteproc: Use kstrdup_const() rather than kstrdup() Mathieu Poirier
2020-04-21 1:56 ` Bjorn Andersson
2020-04-21 1:56 ` Bjorn Andersson
2020-04-21 1:56 ` Bjorn Andersson
2020-04-20 23:15 ` [PATCH v3 2/4] remoteproc: Restructure firmware name allocation Mathieu Poirier
2020-04-21 1:56 ` Bjorn Andersson
2020-04-21 1:56 ` Bjorn Andersson
2020-04-21 1:56 ` Bjorn Andersson
2020-04-20 23:16 ` [PATCH v3 3/4] remoteproc: Split rproc_ops allocation from rproc_alloc() Mathieu Poirier
2020-04-21 1:57 ` Bjorn Andersson
2020-04-21 1:57 ` Bjorn Andersson
2020-04-21 1:57 ` Bjorn Andersson
2020-04-20 23:16 ` [PATCH v3 4/4] remoteproc: Get rid of tedious error path Mathieu Poirier
2020-04-21 2:01 ` Bjorn Andersson [this message]
2020-04-21 2:01 ` Bjorn Andersson
2020-04-21 2:01 ` Bjorn Andersson
2020-04-21 3:20 ` [PATCH v3 0/4] remoteproc: Refactor function rproc_alloc() patchwork-bot+linux-remoteproc
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=20200421020107.GJ1868936@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=Markus.Elfring@web.de \
--cc=elder@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.