diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2013-08-05 20:17:19 +0530 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-08-09 16:39:46 +1000 |
| commit | d52dc81e14c648fb1015d51c658347127d624173 (patch) | |
| tree | ba4daa6dcd8601942af794c6fc4f6752494c0e29 /drivers/char | |
| parent | 4390f77b37b89d32236676a48997d83489feff4e (diff) | |
| download | linux-stable-d52dc81e14c648fb1015d51c658347127d624173.tar.gz linux-stable-d52dc81e14c648fb1015d51c658347127d624173.tar.bz2 linux-stable-d52dc81e14c648fb1015d51c658347127d624173.zip | |
hwrng: omap - Convert to devm_kzalloc()
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/omap-rng.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index 3e9a7ecbd5e5..9c19396b940f 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -109,7 +109,8 @@ static int omap_rng_probe(struct platform_device *pdev) struct omap_rng_private_data *priv; int ret; - priv = kzalloc(sizeof(struct omap_rng_private_data), GFP_KERNEL); + priv = devm_kzalloc(&pdev->dev, sizeof(struct omap_rng_private_data), + GFP_KERNEL); if (!priv) { dev_err(&pdev->dev, "could not allocate memory\n"); return -ENOMEM; @@ -144,8 +145,6 @@ err_register: priv->base = NULL; pm_runtime_disable(&pdev->dev); err_ioremap: - kfree(priv); - return ret; } @@ -160,10 +159,6 @@ static int __exit omap_rng_remove(struct platform_device *pdev) pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - release_mem_region(priv->mem_res->start, resource_size(priv->mem_res)); - - kfree(priv); - return 0; } |