redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

gpio: 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>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
hifive-unleashed-5.1
Linus Walleij 2014-09-16 15:11:41 -07:00
parent 2fcea6cecb
commit da26d5d803
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpio/gpio-crystalcove.c
View File

@ -346,7 +346,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
return 0;
out_remove_gpio:
WARN_ON(gpiochip_remove(&cg->chip));
gpiochip_remove(&cg->chip);
return retval;
}
@ -354,14 +354,11 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
{
struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);
int err;
err = gpiochip_remove(&cg->chip);
gpiochip_remove(&cg->chip);
if (irq >= 0)
free_irq(irq, cg);
return err;
return 0;
}
static struct platform_driver crystalcove_gpio_driver = {

2
drivers/gpio/gpio-omap.c
View File

@ -1143,7 +1143,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank)
if (ret) {
dev_err(bank->dev, "Couldn't add irqchip to gpiochip %d\n", ret);
ret = gpiochip_remove(&bank->chip);
gpiochip_remove(&bank->chip);
return -ENODEV;
}

7
drivers/gpio/gpio-xgene.c
View File

@ -216,12 +216,9 @@ err:
static int xgene_gpio_remove(struct platform_device *pdev)
{
struct xgene_gpio *gpio = platform_get_drvdata(pdev);
int ret = 0;
ret = gpiochip_remove(&gpio->chip);
if (ret)
dev_err(&pdev->dev, "unable to remove gpio_chip.\n");
return ret;
gpiochip_remove(&gpio->chip);
return 0;
}
#ifdef CONFIG_OF

8
drivers/gpio/gpio-zynq.c
View File

@ -686,16 +686,10 @@ err_disable_clk:
*/
static int zynq_gpio_remove(struct platform_device *pdev)
{
int ret;
struct zynq_gpio *gpio = platform_get_drvdata(pdev);
pm_runtime_get_sync(&pdev->dev);
ret = gpiochip_remove(&gpio->chip);
if (ret) {
dev_err(&pdev->dev, "Failed to remove gpio chip\n");
return ret;
}
gpiochip_remove(&gpio->chip);
clk_disable_unprepare(gpio->clk);
device_set_wakeup_capable(&pdev->dev, 0);
return 0;