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

Commit b4e7c55d authored by abdoulaye berthe's avatar abdoulaye berthe Committed by Linus Walleij
Browse files

pinctrl: remove all usage of gpio_remove ret val in driver/pinctl 



Signed-off-by: default avatarabdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 144ef626

drivers/pinctrl/pinctrl-adi2.c

+4 −5
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static int adi_gpio_probe(struct platform_device *pdev) 
	struct gpio_port *port;

	char pinctrl_devname[DEVNAME_SIZE];

	static int gpio;

	int ret = 0, ret1;

	int ret = 0;



	pdata = dev->platform_data;

	if (!pdata)
@@ -1027,7 +1027,7 @@ static int adi_gpio_probe(struct platform_device *pdev) 
	return 0;



out_remove_gpiochip:

	ret1 = gpiochip_remove(&port->chip);

	gpiochip_remove(&port->chip);

out_remove_domain:

	if (port->pint)

		irq_domain_remove(port->domain);
@@ -1038,12 +1038,11 @@ static int adi_gpio_probe(struct platform_device *pdev) 
static int adi_gpio_remove(struct platform_device *pdev)

{

	struct gpio_port *port = platform_get_drvdata(pdev);

	int ret;

	u8 offset;



	list_del(&port->node);

	gpiochip_remove_pin_ranges(&port->chip);

	ret = gpiochip_remove(&port->chip);

	gpiochip_remove(&port->chip);

	if (port->pint) {

		for (offset = 0; offset < port->width; offset++)

			irq_dispose_mapping(irq_find_mapping(port->domain,
@@ -1051,7 +1050,7 @@ static int adi_gpio_remove(struct platform_device *pdev) 
		irq_domain_remove(port->domain);

	}



	return ret;

	return 0;

}



static int adi_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/pinctrl-as3722.c

+2 −9
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) 
{

	struct as3722_pctrl_info *as_pci;

	int ret;

	int tret;



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

	if (!as_pci)
@@ -611,10 +610,7 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) 
	return 0;



fail_range_add:

	tret = gpiochip_remove(&as_pci->gpio_chip);

	if (tret < 0)

		dev_warn(&pdev->dev, "Couldn't remove gpio chip, %d\n", tret);



	gpiochip_remove(&as_pci->gpio_chip);

fail_chip_add:

	pinctrl_unregister(as_pci->pctl);

	return ret;
@@ -623,11 +619,8 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) 
static int as3722_pinctrl_remove(struct platform_device *pdev)

{

	struct as3722_pctrl_info *as_pci = platform_get_drvdata(pdev);

	int ret;



	ret = gpiochip_remove(&as_pci->gpio_chip);

	if (ret < 0)

		return ret;

	gpiochip_remove(&as_pci->gpio_chip);

	pinctrl_unregister(as_pci->pctl);

	return 0;

}

drivers/pinctrl/pinctrl-baytrail.c

+1 −4
Original line number Diff line number Diff line
@@ -638,12 +638,9 @@ MODULE_DEVICE_TABLE(acpi, byt_gpio_acpi_match); 
static int byt_gpio_remove(struct platform_device *pdev)

{

	struct byt_gpio *vg = platform_get_drvdata(pdev);

	int err;



	pm_runtime_disable(&pdev->dev);

	err = gpiochip_remove(&vg->chip);

	if (err)

		dev_warn(&pdev->dev, "failed to remove gpio_chip.\n");

	gpiochip_remove(&vg->chip);



	return 0;

}

drivers/pinctrl/pinctrl-coh901.c

+2 −8
Original line number Diff line number Diff line
@@ -756,8 +756,7 @@ static int __init u300_gpio_probe(struct platform_device *pdev) 


err_no_range:

err_no_irqchip:

	if (gpiochip_remove(&gpio->chip))

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

	gpiochip_remove(&gpio->chip);

err_no_chip:

	clk_disable_unprepare(gpio->clk);

	dev_err(&pdev->dev, "module ERROR:%d\n", err);
@@ -767,16 +766,11 @@ static int __init u300_gpio_probe(struct platform_device *pdev) 
static int __exit u300_gpio_remove(struct platform_device *pdev)

{

	struct u300_gpio *gpio = platform_get_drvdata(pdev);

	int err;



	/* Turn off the GPIO block */

	writel(0x00000000U, gpio->base + U300_GPIO_CR);



	err = gpiochip_remove(&gpio->chip);

	if (err < 0) {

		dev_err(gpio->dev, "unable to remove gpiochip: %d\n", err);

		return err;

	}

	gpiochip_remove(&gpio->chip);

	clk_disable_unprepare(gpio->clk);

	return 0;

}

drivers/pinctrl/pinctrl-rockchip.c

+4 −12
Original line number Diff line number Diff line
@@ -1492,10 +1492,7 @@ static int rockchip_gpiolib_register(struct platform_device *pdev, 
	for (--i, --bank; i >= 0; --i, --bank) {

		if (!bank->valid)

			continue;



		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;

}
@@ -1505,20 +1502,15 @@ static int rockchip_gpiolib_unregister(struct platform_device *pdev, 
{

	struct rockchip_pin_ctrl *ctrl = info->ctrl;

	struct rockchip_pin_bank *bank = ctrl->pin_banks;

	int ret = 0;

	int i;



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

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

		if (!bank->valid)

			continue;



		ret = gpiochip_remove(&bank->gpio_chip);

		gpiochip_remove(&bank->gpio_chip);

	}



	if (ret)

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



	return ret;

	return 0;

}



static int rockchip_get_bank_data(struct rockchip_pin_bank *bank,