diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 11:11:31 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-08-14 09:31:36 -0400 |
| commit | 4a9b7f9f2704405c05b213f8f51e9f7f1fe02d1a (patch) | |
| tree | fe582e9da382bc4fe1d398232f0285670e723778 /drivers/ata | |
| parent | 404eafe137f858b21e2b57e3f980057ec8919fea (diff) | |
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>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_rcar.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 8108eb06544..c2d95e9fb97 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -778,10 +778,6 @@ static int sata_rcar_probe(struct platform_device *pdev) int irq; int ret = 0; - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (mem == NULL) - return -EINVAL; - irq = platform_get_irq(pdev, 0); if (irq <= 0) return -EINVAL; @@ -807,6 +803,7 @@ static int sata_rcar_probe(struct platform_device *pdev) host->private_data = priv; + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); priv->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->base)) { ret = PTR_ERR(priv->base); |