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

Commit 50f690d8 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl/nomadik: simplify GPIO probe 



Instead of jumping to a label later in the probe just return
with an error code whenever probe() fails. Make sure to remove
the gpiochip on irqdomain error now that we're at it.

Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent aa6e379a

drivers/pinctrl/pinctrl-nomadik.c

+17 −35
Original line number Original line Diff line number Diff line
@@ -1341,8 +1341,7 @@ static int nmk_gpio_probe(struct platform_device *dev) 




		if (of_property_read_u32(np, "gpio-bank", &dev->id)) {

		if (of_property_read_u32(np, "gpio-bank", &dev->id)) {

			dev_err(&dev->dev, "gpio-bank property not found\n");

			dev_err(&dev->dev, "gpio-bank property not found\n");

			ret = -EINVAL;

			return -EINVAL;

			goto out;

		}

		}





		pdata->first_gpio = dev->id * NMK_GPIO_PER_CHIP;

		pdata->first_gpio = dev->id * NMK_GPIO_PER_CHIP;
@@ -1350,41 +1349,29 @@ static int nmk_gpio_probe(struct platform_device *dev) 
	}

	}





	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	if (!res) {

	if (!res)

		ret = -ENOENT;

		return -ENOENT;

		goto out;

	}





	irq = platform_get_irq(dev, 0);

	irq = platform_get_irq(dev, 0);

	if (irq < 0) {

	if (irq < 0)

		ret = irq;

		return irq;

		goto out;

	}





	secondary_irq = platform_get_irq(dev, 1);

	secondary_irq = platform_get_irq(dev, 1);

	if (secondary_irq >= 0 && !pdata->get_secondary_status) {

	if (secondary_irq >= 0 && !pdata->get_secondary_status)

		ret = -EINVAL;

		return -EINVAL;

		goto out;

	}





	base = devm_request_and_ioremap(&dev->dev, res);

	base = devm_request_and_ioremap(&dev->dev, res);

	if (!base) {

	if (!base)

		ret = -ENOMEM;

		return -ENOMEM;

		goto out;

	}





	clk = devm_clk_get(&dev->dev, NULL);

	clk = devm_clk_get(&dev->dev, NULL);

	if (IS_ERR(clk)) {

	if (IS_ERR(clk))

		ret = PTR_ERR(clk);

		return PTR_ERR(clk);

		goto out;

	}

	clk_prepare(clk);

	clk_prepare(clk);





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

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

	if (!nmk_chip) {

	if (!nmk_chip)

		ret = -ENOMEM;

		return -ENOMEM;

		goto out;

	}





	/*

	/*

	 * The virt address in nmk_chip->addr is in the nomadik register space,

	 * The virt address in nmk_chip->addr is in the nomadik register space,
@@ -1418,7 +1405,7 @@ static int nmk_gpio_probe(struct platform_device *dev) 




	ret = gpiochip_add(&nmk_chip->chip);

	ret = gpiochip_add(&nmk_chip->chip);

	if (ret)

	if (ret)

		goto out;

		return ret;





	BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));

	BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));
@@ -1433,8 +1420,9 @@ static int nmk_gpio_probe(struct platform_device *dev) 
				&nmk_gpio_irq_simple_ops, nmk_chip);

				&nmk_gpio_irq_simple_ops, nmk_chip);

	if (!nmk_chip->domain) {

	if (!nmk_chip->domain) {

		dev_err(&dev->dev, "failed to create irqdomain\n");

		dev_err(&dev->dev, "failed to create irqdomain\n");

		ret = -ENOSYS;

		/* Just do this, no matter if it fails */

		goto out;

		ret = gpiochip_remove(&nmk_chip->chip);

		return -ENOSYS;

	}

	}





	nmk_gpio_init_irq(nmk_chip);

	nmk_gpio_init_irq(nmk_chip);
@@ -1442,12 +1430,6 @@ static int nmk_gpio_probe(struct platform_device *dev) 
	dev_info(&dev->dev, "at address %p\n", nmk_chip->addr);

	dev_info(&dev->dev, "at address %p\n", nmk_chip->addr);





	return 0;

	return 0;



out:

	dev_err(&dev->dev, "Failure %i for GPIO %i-%i\n", ret,

		  pdata->first_gpio, pdata->first_gpio+31);



	return ret;

}

}





static int nmk_get_groups_cnt(struct pinctrl_dev *pctldev)

static int nmk_get_groups_cnt(struct pinctrl_dev *pctldev)