From: Gatien CHEVALLIER <gatien.chevallier@foss.st.com>
To: Marek Vasut <marex@denx.de>, <linux-crypto@vger.kernel.org>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Olivia Mackall" <olivia@selenic.com>,
"Rob Herring" <robh@kernel.org>,
"Yang Yingliang" <yangyingliang@huawei.com>,
kernel@dh-electronics.com, linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com
Subject: Re: [PATCH 2/2] hwrng: stm32 - cache device pointer in struct stm32_rng_private
Date: Thu, 16 May 2024 11:37:26 +0200 [thread overview]
Message-ID: <1e2da893-efff-4f7c-9842-a9484e4c2230@foss.st.com> (raw)
In-Reply-To: <20240516012210.128307-2-marex@denx.de>
On 5/16/24 03:20, Marek Vasut wrote:
> Place device pointer in struct stm32_rng_private and use it all over the
> place to get rid of the horrible type casts throughout the driver.
>
> No functional change.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
> Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
> Cc: Gatien Chevallier <gatien.chevallier@foss.st.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Cc: Olivia Mackall <olivia@selenic.com>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Yang Yingliang <yangyingliang@huawei.com>
> Cc: kernel@dh-electronics.com
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-crypto@vger.kernel.org
> Cc: linux-stm32@st-md-mailman.stormreply.com
> ---
> drivers/char/hw_random/stm32-rng.c | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/char/hw_random/stm32-rng.c b/drivers/char/hw_random/stm32-rng.c
> index 6dec4adc49853..00012e6e4ccc8 100644
> --- a/drivers/char/hw_random/stm32-rng.c
> +++ b/drivers/char/hw_random/stm32-rng.c
> @@ -70,6 +70,7 @@ struct stm32_rng_config {
>
> struct stm32_rng_private {
> struct hwrng rng;
> + struct device *dev;
> void __iomem *base;
> struct clk *clk;
> struct reset_control *rst;
> @@ -99,7 +100,7 @@ struct stm32_rng_private {
> */
> static int stm32_rng_conceal_seed_error_cond_reset(struct stm32_rng_private *priv)
> {
> - struct device *dev = (struct device *)priv->rng.priv;
> + struct device *dev = priv->dev;
> u32 sr = readl_relaxed(priv->base + RNG_SR);
> u32 cr = readl_relaxed(priv->base + RNG_CR);
> int err;
> @@ -171,7 +172,7 @@ static int stm32_rng_conceal_seed_error(struct hwrng *rng)
> {
> struct stm32_rng_private *priv = container_of(rng, struct stm32_rng_private, rng);
>
> - dev_dbg((struct device *)priv->rng.priv, "Concealing seed error\n");
> + dev_dbg(priv->dev, "Concealing seed error\n");
>
> if (priv->data->has_cond_reset)
> return stm32_rng_conceal_seed_error_cond_reset(priv);
> @@ -187,7 +188,7 @@ static int stm32_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
> int retval = 0, err = 0;
> u32 sr;
>
> - retval = pm_runtime_resume_and_get((struct device *)priv->rng.priv);
> + retval = pm_runtime_resume_and_get(priv->dev);
> if (retval)
> return retval;
>
> @@ -206,7 +207,7 @@ static int stm32_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
> sr, sr,
> 10, 50000);
> if (err) {
> - dev_err((struct device *)priv->rng.priv,
> + dev_err(priv->dev,
> "%s: timeout %x!\n", __func__, sr);
Nit: Fits in one line
> break;
> }
> @@ -220,7 +221,7 @@ static int stm32_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
> err = stm32_rng_conceal_seed_error(rng);
> i++;
> if (err && i > RNG_NB_RECOVER_TRIES) {
> - dev_err((struct device *)priv->rng.priv,
> + dev_err(priv->dev,
> "Couldn't recover from seed error\n");
Nit: Fits in one line
> retval = -ENOTRECOVERABLE;
> goto exit_rpm;
> @@ -239,7 +240,7 @@ static int stm32_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
> err = stm32_rng_conceal_seed_error(rng);
> i++;
> if (err && i > RNG_NB_RECOVER_TRIES) {
> - dev_err((struct device *)priv->rng.priv,
> + dev_err(priv->dev,
> "Couldn't recover from seed error");
Nit: Fits in one line
> retval = -ENOTRECOVERABLE;
> goto exit_rpm;
> @@ -255,8 +256,8 @@ static int stm32_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
> }
>
> exit_rpm:
> - pm_runtime_mark_last_busy((struct device *) priv->rng.priv);
> - pm_runtime_put_sync_autosuspend((struct device *) priv->rng.priv);
> + pm_runtime_mark_last_busy(priv->dev);
> + pm_runtime_put_sync_autosuspend(priv->dev);
>
> return retval || !wait ? retval : -EIO;
> }
> @@ -331,8 +332,7 @@ static int stm32_rng_init(struct hwrng *rng)
> 10, 50000);
> if (err) {
> clk_disable_unprepare(priv->clk);
> - dev_err((struct device *)priv->rng.priv,
> - "%s: timeout %x!\n", __func__, reg);
> + dev_err(priv->dev, "%s: timeout %x!\n", __func__, reg);
> return -EINVAL;
> }
> } else {
> @@ -360,7 +360,7 @@ static int stm32_rng_init(struct hwrng *rng)
> 10, 100000);
> if (err || (reg & ~RNG_SR_DRDY)) {
> clk_disable_unprepare(priv->clk);
> - dev_err((struct device *)priv->rng.priv,
> + dev_err(priv->dev,
> "%s: timeout:%x SR: %x!\n", __func__, err, reg);
Nit: Fits in one line
> return -EINVAL;
> }
> @@ -467,7 +467,7 @@ static int __maybe_unused stm32_rng_resume(struct device *dev)
>
> if (err) {
> clk_disable_unprepare(priv->clk);
> - dev_err((struct device *)priv->rng.priv,
> + dev_err(priv->dev,
> "%s: timeout:%x CR: %x!\n", __func__, err, reg);
> return -EINVAL;
> }
> @@ -543,6 +543,7 @@ static int stm32_rng_probe(struct platform_device *ofdev)
>
> priv->ced = of_property_read_bool(np, "clock-error-detect");
> priv->lock_conf = of_property_read_bool(np, "st,rng-lock-conf");
> + priv->dev = dev;
>
> priv->data = of_device_get_match_data(dev);
> if (!priv->data)
With nits applied,
Acked-by: Gatien Chevallier <gatien.chevallier@foss.st.com>
next prev parent reply other threads:[~2024-05-16 9:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 1:20 [PATCH 1/2] hwrng: stm32 - use pm_runtime_resume_and_get() Marek Vasut
2024-05-16 1:20 ` [PATCH 2/2] hwrng: stm32 - cache device pointer in struct stm32_rng_private Marek Vasut
2024-05-16 9:37 ` Gatien CHEVALLIER [this message]
2024-05-16 10:52 ` Marek Vasut
2024-05-16 11:47 ` Gatien CHEVALLIER
2024-05-16 8:12 ` [PATCH 1/2] hwrng: stm32 - use pm_runtime_resume_and_get() Gatien CHEVALLIER
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=1e2da893-efff-4f7c-9842-a9484e4c2230@foss.st.com \
--to=gatien.chevallier@foss.st.com \
--cc=alexandre.torgue@foss.st.com \
--cc=herbert@gondor.apana.org.au \
--cc=kernel@dh-electronics.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=marex@denx.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=olivia@selenic.com \
--cc=robh@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=yangyingliang@huawei.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 read-only IMAP folder(s) and NNTP newsgroup(s).