Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 08:39:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: nomadik: simplify use of devm_ioremap_resource

Browse Source 
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: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Julia Lawall 2013-08-14 11:11:05 +02:00 committed by Linus Walleij
parent 0d74d4a161
commit 690ebabb0b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pinctrl/pinctrl-nomadik.c
View File

@ -1055,10 +1055,6 @@ static int nmk_gpio_probe(struct platform_device *dev)
pdata->num_gpio = NMK_GPIO_PER_CHIP; pdata->num_gpio = NMK_GPIO_PER_CHIP;
} }
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
if (!res)
return -ENOENT;
irq = platform_get_irq(dev, 0); irq = platform_get_irq(dev, 0);
if (irq < 0) if (irq < 0)
return irq; return irq;
@ -1067,6 +1063,7 @@ static int nmk_gpio_probe(struct platform_device *dev)
if (secondary_irq >= 0 && !pdata->get_secondary_status) if (secondary_irq >= 0 && !pdata->get_secondary_status)
return -EINVAL; return -EINVAL;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&dev->dev, res); base = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);