| From 7ebdc8dd825f565e287fd37a115dba44ec8c34db Mon Sep 17 00:00:00 2001 |
| From: Julia Lawall <Julia.Lawall@lip6.fr> |
| Date: Wed, 14 Aug 2013 11:11:31 +0200 |
| Subject: 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> |
| (cherry picked from commit 4a9b7f9f2704405c05b213f8f51e9f7f1fe02d1a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/ata/sata_rcar.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c |
| index 8108eb06..c2d95e9f 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); |
| -- |
| 1.8.4.3.gca3854a |
| |