From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: herbert@gondor.apana.org.au, dmitry.torokhov@gmail.com,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
jogo@openwrt.org, f.fainelli@gmail.com, cernekee@gmail.com
Cc: "Álvaro Fernández Rojas" <noltari@gmail.com>
Subject: [PATCH] hw_random: bcm63xx-rng: fix bugs introduced in commit 6229c16060fee9a015bf476f21e40c6f08609d6e.
Date: Fri, 1 May 2015 16:37:21 +0200 [thread overview]
Message-ID: <1430491041-24480-1-git-send-email-noltari@gmail.com> (raw)
s/clk_didsable_unprepare/clk_disable_unprepare
s/prov/priv
s/error/ret in bcm63xx_rng_probe
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
drivers/char/hw_random/bcm63xx-rng.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index d1494ec..4b31f13 100644
--- a/drivers/char/hw_random/bcm63xx-rng.c
+++ b/drivers/char/hw_random/bcm63xx-rng.c
@@ -57,7 +57,7 @@ static void bcm63xx_rng_cleanup(struct hwrng *rng)
val &= ~RNG_EN;
__raw_writel(val, priv->regs + RNG_CTRL);
- clk_didsable_unprepare(prov->clk);
+ clk_disable_unprepare(priv->clk);
}
static int bcm63xx_rng_data_present(struct hwrng *rng, int wait)
@@ -97,14 +97,14 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
priv->rng.name = pdev->name;
priv->rng.init = bcm63xx_rng_init;
priv->rng.cleanup = bcm63xx_rng_cleanup;
- prov->rng.data_present = bcm63xx_rng_data_present;
+ priv->rng.data_present = bcm63xx_rng_data_present;
priv->rng.data_read = bcm63xx_rng_data_read;
priv->clk = devm_clk_get(&pdev->dev, "ipsec");
if (IS_ERR(priv->clk)) {
- error = PTR_ERR(priv->clk);
- dev_err(&pdev->dev, "no clock for device: %d\n", error);
- return error;
+ ret = PTR_ERR(priv->clk);
+ dev_err(&pdev->dev, "no clock for device: %d\n", ret);
+ return ret;
}
if (!devm_request_mem_region(&pdev->dev, r->start,
@@ -120,11 +120,11 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
return -ENOMEM;
}
- error = devm_hwrng_register(&pdev->dev, &priv->rng);
- if (error) {
+ ret = devm_hwrng_register(&pdev->dev, &priv->rng);
+ if (ret) {
dev_err(&pdev->dev, "failed to register rng device: %d\n",
- error);
- return error;
+ ret);
+ return ret;
}
dev_info(&pdev->dev, "registered RNG driver\n");
--
1.9.1
next reply other threads:[~2015-05-01 14:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-01 14:37 Álvaro Fernández Rojas [this message]
2015-05-01 17:27 ` [PATCH] hw_random: bcm63xx-rng: fix bugs introduced in commit 6229c16060fee9a015bf476f21e40c6f08609d6e Florian Fainelli
2015-05-02 10:08 ` [PATCH v2] hw_random: bcm63xx-rng: Fix driver compilation Álvaro Fernández Rojas
2015-05-04 9:57 ` Herbert Xu
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=1430491041-24480-1-git-send-email-noltari@gmail.com \
--to=noltari@gmail.com \
--cc=cernekee@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=jogo@openwrt.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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