diff options
author | abdoulaye berthe <berthe.ab@gmail.com> | 2014-07-12 16:30:12 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-07-22 10:39:26 -0400 |
commit | 9f5132ae82fdbb047cc187bf689a81c8cc0de7fa (patch) | |
tree | 3d5ce5c1a1ff25fdbec52416ad21eb1ad14ca25f /drivers/gpio/gpio-pch.c | |
parent | 38ed0187d2da7f219f9f84d8921b5c95b266b34b (diff) |
gpio: remove all usage of gpio_remove retval in driver/gpio
Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pch.c')
-rw-r--r-- | drivers/gpio/gpio-pch.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c index d6eac9b17db9..e0ac549dccb5 100644 --- a/drivers/gpio/gpio-pch.c +++ b/drivers/gpio/gpio-pch.c | |||
@@ -426,9 +426,7 @@ end: | |||
426 | 426 | ||
427 | err_request_irq: | 427 | err_request_irq: |
428 | irq_free_descs(irq_base, gpio_pins[chip->ioh]); | 428 | irq_free_descs(irq_base, gpio_pins[chip->ioh]); |
429 | 429 | gpiochip_remove(&chip->gpio); | |
430 | if (gpiochip_remove(&chip->gpio)) | ||
431 | dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); | ||
432 | 430 | ||
433 | err_gpiochip_add: | 431 | err_gpiochip_add: |
434 | pci_iounmap(pdev, chip->base); | 432 | pci_iounmap(pdev, chip->base); |
@@ -447,7 +445,6 @@ err_pci_enable: | |||
447 | 445 | ||
448 | static void pch_gpio_remove(struct pci_dev *pdev) | 446 | static void pch_gpio_remove(struct pci_dev *pdev) |
449 | { | 447 | { |
450 | int err; | ||
451 | struct pch_gpio *chip = pci_get_drvdata(pdev); | 448 | struct pch_gpio *chip = pci_get_drvdata(pdev); |
452 | 449 | ||
453 | if (chip->irq_base != -1) { | 450 | if (chip->irq_base != -1) { |
@@ -456,10 +453,7 @@ static void pch_gpio_remove(struct pci_dev *pdev) | |||
456 | irq_free_descs(chip->irq_base, gpio_pins[chip->ioh]); | 453 | irq_free_descs(chip->irq_base, gpio_pins[chip->ioh]); |
457 | } | 454 | } |
458 | 455 | ||
459 | err = gpiochip_remove(&chip->gpio); | 456 | gpiochip_remove(&chip->gpio); |
460 | if (err) | ||
461 | dev_err(&pdev->dev, "Failed gpiochip_remove\n"); | ||
462 | |||
463 | pci_iounmap(pdev, chip->base); | 457 | pci_iounmap(pdev, chip->base); |
464 | pci_release_regions(pdev); | 458 | pci_release_regions(pdev); |
465 | pci_disable_device(pdev); | 459 | pci_disable_device(pdev); |