diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:13 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-08-14 06:42:04 -0400 |
commit | 9dc48034596f3ef47ec5eb820f4dde4129d83a56 (patch) | |
tree | 1e3f62d7c93cf500a224a2298deeba4765a77685 /drivers/char | |
parent | c849163b80c05f4567b1adef5db7f377460f88cd (diff) |
hwrng: tx4939 - simplify use of devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hw_random/tx4939-rng.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c index 00593c847cf0..09c5fbea2b93 100644 --- a/drivers/char/hw_random/tx4939-rng.c +++ b/drivers/char/hw_random/tx4939-rng.c | |||
@@ -110,12 +110,10 @@ static int __init tx4939_rng_probe(struct platform_device *dev) | |||
110 | struct resource *r; | 110 | struct resource *r; |
111 | int i; | 111 | int i; |
112 | 112 | ||
113 | r = platform_get_resource(dev, IORESOURCE_MEM, 0); | ||
114 | if (!r) | ||
115 | return -EBUSY; | ||
116 | rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL); | 113 | rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL); |
117 | if (!rngdev) | 114 | if (!rngdev) |
118 | return -ENOMEM; | 115 | return -ENOMEM; |
116 | r = platform_get_resource(dev, IORESOURCE_MEM, 0); | ||
119 | rngdev->base = devm_ioremap_resource(&dev->dev, r); | 117 | rngdev->base = devm_ioremap_resource(&dev->dev, r); |
120 | if (IS_ERR(rngdev->base)) | 118 | if (IS_ERR(rngdev->base)) |
121 | return PTR_ERR(rngdev->base); | 119 | return PTR_ERR(rngdev->base); |