Commit b7d12a86 authored Aug 14, 2013 by Julia Lawall Committed by Wolfram Sang Aug 15, 2013

drivers/i2c/busses/i2c-ocores.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: Wolfram Sang <wsa@the-dreams.de>

parent ad90efae

drivers/i2c/busses/i2c-ocores.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -353,10 +353,6 @@ static int ocores_i2c_probe(struct platform_device *pdev)
		int ret;
		int i;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!res)
		return -ENODEV;

		irq = platform_get_irq(pdev, 0);
		if (irq < 0)
		return irq;
		@@ -365,6 +361,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
		if (!i2c)
		return -ENOMEM;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		i2c->base = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(i2c->base))
		return PTR_ERR(i2c->base);