* [PATCH 2/5] hwrng: omap3-rom: Use devm_clk_get()
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
@ 2014-02-27 5:02 ` Jingoo Han
2014-02-27 5:04 ` [PATCH 3/5] hwrng: pixocell - " Jingoo Han
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Jingoo Han @ 2014-02-27 5:02 UTC (permalink / raw)
To: 'Herbert Xu'
Cc: linux-kernel, 'Pali Rohár', 'Juha Yrjola',
'Tony Lindgren', 'Jingoo Han'
Use devm_clk_get() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/char/hw_random/omap3-rom-rng.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/char/hw_random/omap3-rom-rng.c b/drivers/char/hw_random/omap3-rom-rng.c
index c853e9e..6f2eaff 100644
--- a/drivers/char/hw_random/omap3-rom-rng.c
+++ b/drivers/char/hw_random/omap3-rom-rng.c
@@ -103,7 +103,7 @@ static int omap3_rom_rng_probe(struct platform_device *pdev)
}
setup_timer(&idle_timer, omap3_rom_rng_idle, 0);
- rng_clk = clk_get(&pdev->dev, "ick");
+ rng_clk = devm_clk_get(&pdev->dev, "ick");
if (IS_ERR(rng_clk)) {
pr_err("unable to get RNG clock\n");
return PTR_ERR(rng_clk);
@@ -120,7 +120,6 @@ static int omap3_rom_rng_remove(struct platform_device *pdev)
{
hwrng_unregister(&omap3_rom_rng_ops);
clk_disable_unprepare(rng_clk);
- clk_put(rng_clk);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] hwrng: pixocell - Use devm_clk_get()
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
2014-02-27 5:02 ` [PATCH 2/5] hwrng: omap3-rom: " Jingoo Han
@ 2014-02-27 5:04 ` Jingoo Han
2014-02-27 5:06 ` [PATCH 4/5] hwrng: nomadik - Use devm_*() functions Jingoo Han
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Jingoo Han @ 2014-02-27 5:04 UTC (permalink / raw)
To: 'Herbert Xu'
Cc: linux-kernel, 'Jamie Iles', 'Jingoo Han'
Use devm_clk_get() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/char/hw_random/picoxcell-rng.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c
index c03beee..eab5448 100644
--- a/drivers/char/hw_random/picoxcell-rng.c
+++ b/drivers/char/hw_random/picoxcell-rng.c
@@ -108,7 +108,7 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
if (IS_ERR(rng_base))
return PTR_ERR(rng_base);
- rng_clk = clk_get(&pdev->dev, NULL);
+ rng_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(rng_clk)) {
dev_warn(&pdev->dev, "no clk\n");
return PTR_ERR(rng_clk);
@@ -117,7 +117,7 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
ret = clk_enable(rng_clk);
if (ret) {
dev_warn(&pdev->dev, "unable to enable clk\n");
- goto err_enable;
+ return ret;
}
picoxcell_trng_start();
@@ -132,9 +132,6 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
err_register:
clk_disable(rng_clk);
-err_enable:
- clk_put(rng_clk);
-
return ret;
}
@@ -142,7 +139,6 @@ static int picoxcell_trng_remove(struct platform_device *pdev)
{
hwrng_unregister(&picoxcell_trng);
clk_disable(rng_clk);
- clk_put(rng_clk);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] hwrng: nomadik - Use devm_*() functions
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
2014-02-27 5:02 ` [PATCH 2/5] hwrng: omap3-rom: " Jingoo Han
2014-02-27 5:04 ` [PATCH 3/5] hwrng: pixocell - " Jingoo Han
@ 2014-02-27 5:06 ` Jingoo Han
2014-03-05 2:02 ` Linus Walleij
2014-02-27 5:07 ` [PATCH 5/5] hwrng: timeriomem " Jingoo Han
` (3 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Jingoo Han @ 2014-02-27 5:06 UTC (permalink / raw)
To: 'Herbert Xu'
Cc: linux-kernel, 'Alessandro Rubini',
'Linus Walleij', 'Jingoo Han'
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/char/hw_random/nomadik-rng.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index 00e9d2d..9c85815 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -43,7 +43,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
void __iomem *base;
int ret;
- rng_clk = clk_get(&dev->dev, NULL);
+ rng_clk = devm_clk_get(&dev->dev, NULL);
if (IS_ERR(rng_clk)) {
dev_err(&dev->dev, "could not get rng clock\n");
ret = PTR_ERR(rng_clk);
@@ -56,33 +56,28 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
if (ret)
goto out_clk;
ret = -ENOMEM;
- base = ioremap(dev->res.start, resource_size(&dev->res));
+ base = devm_ioremap(&dev->dev, dev->res.start,
+ resource_size(&dev->res));
if (!base)
goto out_release;
nmk_rng.priv = (unsigned long)base;
ret = hwrng_register(&nmk_rng);
if (ret)
- goto out_unmap;
+ goto out_release;
return 0;
-out_unmap:
- iounmap(base);
out_release:
amba_release_regions(dev);
out_clk:
clk_disable(rng_clk);
- clk_put(rng_clk);
return ret;
}
static int nmk_rng_remove(struct amba_device *dev)
{
- void __iomem *base = (void __iomem *)nmk_rng.priv;
hwrng_unregister(&nmk_rng);
- iounmap(base);
amba_release_regions(dev);
clk_disable(rng_clk);
- clk_put(rng_clk);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] hwrng: timeriomem - Use devm_*() functions
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
` (2 preceding siblings ...)
2014-02-27 5:06 ` [PATCH 4/5] hwrng: nomadik - Use devm_*() functions Jingoo Han
@ 2014-02-27 5:07 ` Jingoo Han
2014-02-27 8:34 ` [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Peter Korsgaard
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Jingoo Han @ 2014-02-27 5:07 UTC (permalink / raw)
To: 'Herbert Xu'
Cc: linux-kernel, 'Alexander Clouter', 'Jingoo Han'
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/char/hw_random/timeriomem-rng.c | 40 ++++++++-----------------------
1 file changed, 10 insertions(+), 30 deletions(-)
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 73ce739..439ff8b 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -118,7 +118,8 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
}
/* Allocate memory for the device structure (and zero it) */
- priv = kzalloc(sizeof(struct timeriomem_rng_private_data), GFP_KERNEL);
+ priv = devm_kzalloc(&pdev->dev,
+ sizeof(struct timeriomem_rng_private_data), GFP_KERNEL);
if (!priv) {
dev_err(&pdev->dev, "failed to allocate device structure.\n");
return -ENOMEM;
@@ -134,17 +135,16 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
period = i;
else {
dev_err(&pdev->dev, "missing period\n");
- err = -EINVAL;
- goto out_free;
+ return -EINVAL;
}
- } else
+ } else {
period = pdata->period;
+ }
priv->period = usecs_to_jiffies(period);
if (priv->period < 1) {
dev_err(&pdev->dev, "period is less than one jiffy\n");
- err = -EINVAL;
- goto out_free;
+ return -EINVAL;
}
priv->expires = jiffies;
@@ -160,24 +160,16 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
priv->timeriomem_rng_ops.data_read = timeriomem_rng_data_read;
priv->timeriomem_rng_ops.priv = (unsigned long)priv;
- if (!request_mem_region(res->start, resource_size(res),
- dev_name(&pdev->dev))) {
- dev_err(&pdev->dev, "request_mem_region failed\n");
- err = -EBUSY;
+ priv->io_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(priv->io_base)) {
+ err = PTR_ERR(priv->io_base);
goto out_timer;
}
- priv->io_base = ioremap(res->start, resource_size(res));
- if (priv->io_base == NULL) {
- dev_err(&pdev->dev, "ioremap failed\n");
- err = -EIO;
- goto out_release_io;
- }
-
err = hwrng_register(&priv->timeriomem_rng_ops);
if (err) {
dev_err(&pdev->dev, "problem registering\n");
- goto out;
+ goto out_timer;
}
dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n",
@@ -185,30 +177,18 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
return 0;
-out:
- iounmap(priv->io_base);
-out_release_io:
- release_mem_region(res->start, resource_size(res));
out_timer:
del_timer_sync(&priv->timer);
-out_free:
- kfree(priv);
return err;
}
static int timeriomem_rng_remove(struct platform_device *pdev)
{
struct timeriomem_rng_private_data *priv = platform_get_drvdata(pdev);
- struct resource *res;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
hwrng_unregister(&priv->timeriomem_rng_ops);
del_timer_sync(&priv->timer);
- iounmap(priv->io_base);
- release_mem_region(res->start, resource_size(res));
- kfree(priv);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] hwrng: atmel - Use devm_clk_get()
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
` (3 preceding siblings ...)
2014-02-27 5:07 ` [PATCH 5/5] hwrng: timeriomem " Jingoo Han
@ 2014-02-27 8:34 ` Peter Korsgaard
2014-02-28 13:52 ` Nicolas Ferre
2014-03-10 12:21 ` Herbert Xu
6 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2014-02-27 8:34 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Herbert Xu', linux-kernel, 'Nicolas Ferre',
'Peter Korsgaard'
>>>>> "Jingoo" == Jingoo Han <jg1.han@samsung.com> writes:
> Use devm_clk_get() to make cleanup paths simpler.
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Peter Korsgaard <peter@korsgaard.com>
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] hwrng: atmel - Use devm_clk_get()
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
` (4 preceding siblings ...)
2014-02-27 8:34 ` [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Peter Korsgaard
@ 2014-02-28 13:52 ` Nicolas Ferre
2014-03-10 12:21 ` Herbert Xu
6 siblings, 0 replies; 9+ messages in thread
From: Nicolas Ferre @ 2014-02-28 13:52 UTC (permalink / raw)
To: Jingoo Han, 'Herbert Xu'; +Cc: linux-kernel, 'Peter Korsgaard'
On 27/02/2014 06:00, Jingoo Han :
> Use devm_clk_get() to make cleanup paths simpler.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Thanks a lot.
> ---
> drivers/char/hw_random/atmel-rng.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
> index dfeddf2..851bc7e 100644
> --- a/drivers/char/hw_random/atmel-rng.c
> +++ b/drivers/char/hw_random/atmel-rng.c
> @@ -63,13 +63,13 @@ static int atmel_trng_probe(struct platform_device *pdev)
> if (IS_ERR(trng->base))
> return PTR_ERR(trng->base);
>
> - trng->clk = clk_get(&pdev->dev, NULL);
> + trng->clk = devm_clk_get(&pdev->dev, NULL);
> if (IS_ERR(trng->clk))
> return PTR_ERR(trng->clk);
>
> ret = clk_enable(trng->clk);
> if (ret)
> - goto err_enable;
> + return ret;
>
> writel(TRNG_KEY | 1, trng->base + TRNG_CR);
> trng->rng.name = pdev->name;
> @@ -85,9 +85,6 @@ static int atmel_trng_probe(struct platform_device *pdev)
>
> err_register:
> clk_disable(trng->clk);
> -err_enable:
> - clk_put(trng->clk);
> -
> return ret;
> }
>
> @@ -99,7 +96,6 @@ static int atmel_trng_remove(struct platform_device *pdev)
>
> writel(TRNG_KEY, trng->base + TRNG_CR);
> clk_disable(trng->clk);
> - clk_put(trng->clk);
>
> return 0;
> }
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] hwrng: atmel - Use devm_clk_get()
2014-02-27 5:00 [PATCH 1/5] hwrng: atmel - Use devm_clk_get() Jingoo Han
` (5 preceding siblings ...)
2014-02-28 13:52 ` Nicolas Ferre
@ 2014-03-10 12:21 ` Herbert Xu
6 siblings, 0 replies; 9+ messages in thread
From: Herbert Xu @ 2014-03-10 12:21 UTC (permalink / raw)
To: Jingoo Han
Cc: linux-kernel, 'Nicolas Ferre', 'Peter Korsgaard'
On Thu, Feb 27, 2014 at 02:00:09PM +0900, Jingoo Han wrote:
> Use devm_clk_get() to make cleanup paths simpler.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
All applied. Thanks!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 9+ messages in thread