Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08a67a58 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Walleij
Browse files

drivers/gpio: 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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 388f4308

drivers/gpio/gpio-mvebu.c

+1 −6
Original line number Diff line number Diff line
@@ -566,12 +566,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
	else

		soc_variant = MVEBU_GPIO_SOC_VARIANT_ORION;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "Cannot get memory resource\n");

		return -ENODEV;

	}



	mvchip = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_gpio_chip), GFP_KERNEL);

	if (!mvchip) {

		dev_err(&pdev->dev, "Cannot allocate memory\n");
@@ -611,6 +605,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
	mvchip->chip.dbg_show = mvebu_gpio_dbg_show;



	spin_lock_init(&mvchip->lock);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mvchip->membase = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(mvchip->membase))

		return PTR_ERR(mvchip->membase);

drivers/gpio/gpio-spear-spics.c

+1 −6
Original line number Diff line number Diff line
@@ -128,18 +128,13 @@ static int spics_gpio_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "invalid IORESOURCE_MEM\n");

		return -EBUSY;

	}



	spics = devm_kzalloc(&pdev->dev, sizeof(*spics), GFP_KERNEL);

	if (!spics) {

		dev_err(&pdev->dev, "memory allocation fail\n");

		return -ENOMEM;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	spics->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(spics->base))

		return PTR_ERR(spics->base);