aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-02-12 00:17:08 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2014-02-26 16:56:50 -0500
commitbfaff75b09c42d8fc57b020034e836fe9048f8b1 (patch)
tree84ece2a5e06170aef541be849c06b708bed6ac3a /drivers/char
parent0fdefe2c907610f3efb3163c8b72127007e282aa (diff)
hwrng: atmel - Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler, and remove redundant return value check of platform_get_resource() because the value is checked by devm_ioremap_resource(). Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hw_random/atmel-rng.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index bf9fc6b79328..dfeddf2c00b7 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -54,21 +54,14 @@ static int atmel_trng_probe(struct platform_device *pdev)
54 struct resource *res; 54 struct resource *res;
55 int ret; 55 int ret;
56 56
57 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
58 if (!res)
59 return -EINVAL;
60
61 trng = devm_kzalloc(&pdev->dev, sizeof(*trng), GFP_KERNEL); 57 trng = devm_kzalloc(&pdev->dev, sizeof(*trng), GFP_KERNEL);
62 if (!trng) 58 if (!trng)
63 return -ENOMEM; 59 return -ENOMEM;
64 60
65 if (!devm_request_mem_region(&pdev->dev, res->start, 61 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
66 resource_size(res), pdev->name)) 62 trng->base = devm_ioremap_resource(&pdev->dev, res);
67 return -EBUSY; 63 if (IS_ERR(trng->base))
68 64 return PTR_ERR(trng->base);
69 trng->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
70 if (!trng->base)
71 return -EBUSY;
72 65
73 trng->clk = clk_get(&pdev->dev, NULL); 66 trng->clk = clk_get(&pdev->dev, NULL);
74 if (IS_ERR(trng->clk)) 67 if (IS_ERR(trng->clk))