diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-coh901.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index d182fdd2e715..29cbbab8c3a6 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
@@ -756,8 +756,7 @@ static int __init u300_gpio_probe(struct platform_device *pdev) | |||
756 | 756 | ||
757 | err_no_range: | 757 | err_no_range: |
758 | err_no_irqchip: | 758 | err_no_irqchip: |
759 | if (gpiochip_remove(&gpio->chip)) | 759 | gpiochip_remove(&gpio->chip); |
760 | dev_err(&pdev->dev, "failed to remove gpio chip\n"); | ||
761 | err_no_chip: | 760 | err_no_chip: |
762 | clk_disable_unprepare(gpio->clk); | 761 | clk_disable_unprepare(gpio->clk); |
763 | dev_err(&pdev->dev, "module ERROR:%d\n", err); | 762 | dev_err(&pdev->dev, "module ERROR:%d\n", err); |
@@ -767,16 +766,11 @@ err_no_chip: | |||
767 | static int __exit u300_gpio_remove(struct platform_device *pdev) | 766 | static int __exit u300_gpio_remove(struct platform_device *pdev) |
768 | { | 767 | { |
769 | struct u300_gpio *gpio = platform_get_drvdata(pdev); | 768 | struct u300_gpio *gpio = platform_get_drvdata(pdev); |
770 | int err; | ||
771 | 769 | ||
772 | /* Turn off the GPIO block */ | 770 | /* Turn off the GPIO block */ |
773 | writel(0x00000000U, gpio->base + U300_GPIO_CR); | 771 | writel(0x00000000U, gpio->base + U300_GPIO_CR); |
774 | 772 | ||
775 | err = gpiochip_remove(&gpio->chip); | 773 | gpiochip_remove(&gpio->chip); |
776 | if (err < 0) { | ||
777 | dev_err(gpio->dev, "unable to remove gpiochip: %d\n", err); | ||
778 | return err; | ||
779 | } | ||
780 | clk_disable_unprepare(gpio->clk); | 774 | clk_disable_unprepare(gpio->clk); |
781 | return 0; | 775 | return 0; |
782 | } | 776 | } |