Commit 715ed728 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Bartosz Golaszewski
Browse files

gpio: em: Return early on error in em_gio_probe() 



em_gio_probe() uses managed initializations for everything but creating
the IRQ domain.  Hence in most failure cases, no cleanup needs to be
performed at all.

Make this clearer for the casual reviewer by returning early, instead of
jumping to an out-of-sight label.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 4c411ce3

drivers/gpio/gpio-em.c

+9 −19
Original line number Diff line number Diff line
@@ -282,10 +282,8 @@ static int em_gio_probe(struct platform_device *pdev) 
	int ret;



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

	if (!p) {

		ret = -ENOMEM;

		goto err0;

	}

	if (!p)

		return -ENOMEM;



	p->pdev = pdev;

	platform_set_drvdata(pdev, p);
@@ -298,28 +296,22 @@ static int em_gio_probe(struct platform_device *pdev) 


	if (!io[0] || !io[1] || !irq[0] || !irq[1]) {

		dev_err(&pdev->dev, "missing IRQ or IOMEM\n");

		ret = -EINVAL;

		goto err0;

		return -EINVAL;

	}



	p->base0 = devm_ioremap_nocache(&pdev->dev, io[0]->start,

					resource_size(io[0]));

	if (!p->base0) {

		ret = -ENOMEM;

		goto err0;

	}

	if (!p->base0)

		return -ENOMEM;



	p->base1 = devm_ioremap_nocache(&pdev->dev, io[1]->start,

				   resource_size(io[1]));

	if (!p->base1) {

		ret = -ENOMEM;

		goto err0;

	}

	if (!p->base1)

		return -ENOMEM;



	if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) {

		dev_err(&pdev->dev, "Missing ngpios OF property\n");

		ret = -EINVAL;

		goto err0;

		return -EINVAL;

	}



	gpio_chip = &p->gpio_chip;
@@ -349,9 +341,8 @@ static int em_gio_probe(struct platform_device *pdev) 
	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node, ngpios, 0,

					      &em_gio_irq_domain_ops, p);

	if (!p->irq_domain) {

		ret = -ENXIO;

		dev_err(&pdev->dev, "cannot initialize irq domain\n");

		goto err0;

		return -ENXIO;

	}



	if (devm_request_irq(&pdev->dev, irq[0]->start,
@@ -378,7 +369,6 @@ static int em_gio_probe(struct platform_device *pdev) 


err1:

	irq_domain_remove(p->irq_domain);

err0:

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE