Commit 4a9b7f9f2704405c05b213f8f51e9f7f1fe02d1a
Committed by
Tejun Heo
Tejun Heo
1 parent
404eafe137
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
drivers/ata/sata_rcar.c: 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: Tejun Heo <tj@kernel.org>
Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff
drivers/ata/sata_rcar.c
| ... | ... | @@ -778,10 +778,6 @@ |
| 778 | 778 | int irq; |
| 779 | 779 | int ret = 0; |
| 780 | 780 | |
| 781 | - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | |
| 782 | - if (mem == NULL) | |
| 783 | - return -EINVAL; | |
| 784 | - | |
| 785 | 781 | irq = platform_get_irq(pdev, 0); |
| 786 | 782 | if (irq <= 0) |
| 787 | 783 | return -EINVAL; |
| ... | ... | @@ -807,6 +803,7 @@ |
| 807 | 803 | |
| 808 | 804 | host->private_data = priv; |
| 809 | 805 | |
| 806 | + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | |
| 810 | 807 | priv->base = devm_ioremap_resource(&pdev->dev, mem); |
| 811 | 808 | if (IS_ERR(priv->base)) { |
| 812 | 809 | ret = PTR_ERR(priv->base); |