drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence

[deliverable/linux.git] / drivers / gpio / gpio-pch.c

diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index d6eac9b17db9ef33803a68f98097347d5543097b..e0ac549dccb54c43261d71df59da196144502d67 100644 (file)
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -426,9 +426,7 @@ end:
 
 err_request_irq:
        irq_free_descs(irq_base, gpio_pins[chip->ioh]);
-
-       if (gpiochip_remove(&chip->gpio))
-               dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
+       gpiochip_remove(&chip->gpio);
 
 err_gpiochip_add:
        pci_iounmap(pdev, chip->base);
@@ -447,7 +445,6 @@ err_pci_enable:
 
 static void pch_gpio_remove(struct pci_dev *pdev)
 {
-       int err;
        struct pch_gpio *chip = pci_get_drvdata(pdev);
 
        if (chip->irq_base != -1) {
@@ -456,10 +453,7 @@ static void pch_gpio_remove(struct pci_dev *pdev)
                irq_free_descs(chip->irq_base, gpio_pins[chip->ioh]);
        }
 
-       err = gpiochip_remove(&chip->gpio);
-       if (err)
-               dev_err(&pdev->dev, "Failed gpiochip_remove\n");
-
+       gpiochip_remove(&chip->gpio);
        pci_iounmap(pdev, chip->base);
        pci_release_regions(pdev);
        pci_disable_device(pdev);