diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:29 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-14 14:08:44 -0400 |
commit | 2479790b2970ee386174431af2ad9c948b328b95 (patch) | |
tree | 206503f34ebd9e1762b506a1a62493f9e4e5257a /drivers/spi | |
parent | 7668c29407c861302353f49ca75779f8cb95a6fb (diff) |
spi/sirf: 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>
Acked-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-sirf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 62c92c334260..546fae2c107a 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c | |||
@@ -588,12 +588,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) | |||
588 | platform_set_drvdata(pdev, master); | 588 | platform_set_drvdata(pdev, master); |
589 | sspi = spi_master_get_devdata(master); | 589 | sspi = spi_master_get_devdata(master); |
590 | 590 | ||
591 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
592 | if (!mem_res) { | ||
593 | dev_err(&pdev->dev, "Unable to get IO resource\n"); | ||
594 | ret = -ENODEV; | ||
595 | goto free_master; | ||
596 | } | ||
597 | master->num_chipselect = num_cs; | 591 | master->num_chipselect = num_cs; |
598 | 592 | ||
599 | for (i = 0; i < master->num_chipselect; i++) { | 593 | for (i = 0; i < master->num_chipselect; i++) { |
@@ -620,6 +614,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) | |||
620 | } | 614 | } |
621 | } | 615 | } |
622 | 616 | ||
617 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
623 | sspi->base = devm_ioremap_resource(&pdev->dev, mem_res); | 618 | sspi->base = devm_ioremap_resource(&pdev->dev, mem_res); |
624 | if (IS_ERR(sspi->base)) { | 619 | if (IS_ERR(sspi->base)) { |
625 | ret = PTR_ERR(sspi->base); | 620 | ret = PTR_ERR(sspi->base); |