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

Commit 2fcea6ce authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: remove remaining users of gpiochip_remove() retval 



Some drivers accidentally still use the return value from
gpiochip_remove(). Get rid of them so we can simplify this function
and get rid of the return value.

Cc: Abdoulaye Berthe <berthe.ab@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 88d5e520

drivers/pinctrl/nomadik/pinctrl-abx500.c

+2 −12
Original line number Diff line number Diff line
@@ -1298,10 +1298,7 @@ static int abx500_gpio_probe(struct platform_device *pdev) 
	return 0;



out_rem_chip:

	err = gpiochip_remove(&pct->chip);

	if (err)

		dev_info(&pdev->dev, "failed to remove gpiochip\n");



	gpiochip_remove(&pct->chip);

	return ret;

}
@@ -1312,15 +1309,8 @@ static int abx500_gpio_probe(struct platform_device *pdev) 
static int abx500_gpio_remove(struct platform_device *pdev)

{

	struct abx500_pinctrl *pct = platform_get_drvdata(pdev);

	int ret;



	ret = gpiochip_remove(&pct->chip);

	if (ret < 0) {

		dev_err(pct->dev, "unable to remove gpiochip: %d\n",

			ret);

		return ret;

	}



	gpiochip_remove(&pct->chip);

	return 0;

}

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ static int nmk_gpio_probe(struct platform_device *dev) 
				   IRQ_TYPE_EDGE_FALLING);

	if (ret) {

		dev_err(&dev->dev, "could not add irqchip\n");

		ret = gpiochip_remove(&nmk_chip->chip);

		gpiochip_remove(&nmk_chip->chip);

		return -ENODEV;

	}

	/* Then register the chain on the parent IRQ */

drivers/pinctrl/qcom/pinctrl-msm.c

+1 −8
Original line number Diff line number Diff line
@@ -903,16 +903,9 @@ EXPORT_SYMBOL(msm_pinctrl_probe); 
int msm_pinctrl_remove(struct platform_device *pdev)

{

	struct msm_pinctrl *pctrl = platform_get_drvdata(pdev);

	int ret;



	ret = gpiochip_remove(&pctrl->chip);

	if (ret) {

		dev_err(&pdev->dev, "Failed to remove gpiochip\n");

		return ret;

	}



	gpiochip_remove(&pctrl->chip);

	pinctrl_unregister(pctrl->pctrl);



	return 0;

}

EXPORT_SYMBOL(msm_pinctrl_remove);

drivers/pinctrl/samsung/pinctrl-exynos5440.c

+1 −5
Original line number Diff line number Diff line
@@ -873,11 +873,7 @@ static int exynos5440_gpiolib_register(struct platform_device *pdev, 
static int exynos5440_gpiolib_unregister(struct platform_device *pdev,

				struct exynos5440_pinctrl_priv_data *priv)

{

	int ret = gpiochip_remove(priv->gc);

	if (ret) {

		dev_err(&pdev->dev, "gpio chip remove failed\n");

		return ret;

	}

	gpiochip_remove(priv->gc);

	return 0;

}

drivers/pinctrl/samsung/pinctrl-samsung.c

+4 −11
Original line number Diff line number Diff line
@@ -945,9 +945,7 @@ static int samsung_gpiolib_register(struct platform_device *pdev, 


fail:

	for (--i, --bank; i >= 0; --i, --bank)

		if (gpiochip_remove(&bank->gpio_chip))

			dev_err(&pdev->dev, "gpio chip %s remove failed\n",

							bank->gpio_chip.label);

		gpiochip_remove(&bank->gpio_chip);

	return ret;

}
@@ -957,16 +955,11 @@ static int samsung_gpiolib_unregister(struct platform_device *pdev, 
{

	struct samsung_pin_ctrl *ctrl = drvdata->ctrl;

	struct samsung_pin_bank *bank = ctrl->pin_banks;

	int ret = 0;

	int i;



	for (i = 0; !ret && i < ctrl->nr_banks; ++i, ++bank)

		ret = gpiochip_remove(&bank->gpio_chip);



	if (ret)

		dev_err(&pdev->dev, "gpio chip remove failed\n");



	return ret;

	for (i = 0; i < ctrl->nr_banks; ++i, ++bank)

		gpiochip_remove(&bank->gpio_chip);

	return 0;

}



static const struct of_device_id samsung_pinctrl_dt_match[];