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

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

driver:gpio remove all usage of gpio_remove retval in driver 



this remove all reference to gpio_remove retval in all driver
except pinctrl and gpio. the same thing is done for gpio and
pinctrl in two different patches.

Signed-off-by: default avatarAbdoulaye Berthe <berthe.ab@gmail.com>
Acked-by: default avatarMichael Büsch <m@bues.ch>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2134cb99

arch/arm/common/scoop.c

+2 −8
Original line number Diff line number Diff line
@@ -243,18 +243,12 @@ static int scoop_probe(struct platform_device *pdev) 
static int scoop_remove(struct platform_device *pdev)

{

	struct scoop_dev *sdev = platform_get_drvdata(pdev);

	int ret;



	if (!sdev)

		return -EINVAL;



	if (sdev->gpio.base != -1) {

		ret = gpiochip_remove(&sdev->gpio);

		if (ret) {

			dev_err(&pdev->dev, "Can't remove gpio chip: %d\n", ret);

			return ret;

		}

	}

	if (sdev->gpio.base != -1)

		gpiochip_remove(&sdev->gpio);



	platform_set_drvdata(pdev, NULL);

	iounmap(sdev->base);

arch/mips/txx9/generic/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -789,11 +789,11 @@ void __init txx9_iocled_init(unsigned long baseaddr, 
	if (platform_device_add(pdev))

		goto out_pdev;

	return;



out_pdev:

	platform_device_put(pdev);

out_gpio:

	if (gpiochip_remove(&iocled->chip))

		return;

	gpiochip_remove(&iocled->chip);

out_unmap:

	iounmap(iocled->mmioaddr);

out_free:

arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ static int mcu_gpiochip_add(struct mcu *mcu) 


static int mcu_gpiochip_remove(struct mcu *mcu)

{

	return gpiochip_remove(&mcu->gc);

	gpiochip_remove(&mcu->gc);

	return 0;

}



static int mcu_probe(struct i2c_client *client, const struct i2c_device_id *id)

arch/sh/boards/mach-x3proto/gpio.c

+2 −4
Original line number Diff line number Diff line
@@ -128,10 +128,8 @@ int __init x3proto_gpio_setup(void) 
	return 0;



err_irq:

	ret = gpiochip_remove(&x3proto_gpio_chip);

	if (unlikely(ret))

		pr_err("Failed deregistering GPIO\n");



	gpiochip_remove(&x3proto_gpio_chip);

	ret = 0;

err_gpio:

	synchronize_irq(ilsel);

drivers/bcma/driver_gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -251,5 +251,6 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
int bcma_gpio_unregister(struct bcma_drv_cc *cc)

{

	bcma_gpio_irq_domain_exit(cc);

	return gpiochip_remove(&cc->gpio);

	gpiochip_remove(&cc->gpio);

	return 0;

}