diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-14 12:47:58 -0400 |
commit | de0fa83c410d8ad4bcee72814562eb1be7551edf (patch) | |
tree | a0fd8710f14d1c658954311db01c95a6319dd945 /drivers/spi/spi-bfin-v3.c | |
parent | fa4bd4f1ade784d9cbed67ab228d0ad5edb3830d (diff) |
spi/spi-{bcm63xx.c,bfin-v3.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: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-bfin-v3.c')
-rw-r--r-- | drivers/spi/spi-bfin-v3.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c index 603d7e91085b..d5bab00f190b 100644 --- a/drivers/spi/spi-bfin-v3.c +++ b/drivers/spi/spi-bfin-v3.c | |||
@@ -792,13 +792,6 @@ static int bfin_spi_probe(struct platform_device *pdev) | |||
792 | return -ENXIO; | 792 | return -ENXIO; |
793 | } | 793 | } |
794 | 794 | ||
795 | /* get register base and tx/rx dma */ | ||
796 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
797 | if (!mem) { | ||
798 | dev_err(dev, "can not get register base\n"); | ||
799 | return -ENXIO; | ||
800 | } | ||
801 | |||
802 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); | 795 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); |
803 | if (!res) { | 796 | if (!res) { |
804 | dev_err(dev, "can not get tx dma resource\n"); | 797 | dev_err(dev, "can not get tx dma resource\n"); |
@@ -838,6 +831,7 @@ static int bfin_spi_probe(struct platform_device *pdev) | |||
838 | drv_data->pin_req = info->pin_req; | 831 | drv_data->pin_req = info->pin_req; |
839 | drv_data->sclk = sclk; | 832 | drv_data->sclk = sclk; |
840 | 833 | ||
834 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
841 | drv_data->regs = devm_ioremap_resource(dev, mem); | 835 | drv_data->regs = devm_ioremap_resource(dev, mem); |
842 | if (IS_ERR(drv_data->regs)) { | 836 | if (IS_ERR(drv_data->regs)) { |
843 | ret = PTR_ERR(drv_data->regs); | 837 | ret = PTR_ERR(drv_data->regs); |