diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-09-16 18:05:41 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-23 11:51:12 -0400 |
| commit | 2fcea6cecbc965b4e02a39537d9d939f5251bbbd (patch) | |
| tree | ccfc3423faa851c6231a26ce428962e2059b5fe4 /drivers/pinctrl/samsung | |
| parent | 88d5e520aa9701eb3e4f46165e02097cc03d363a (diff) | |
pinctrl: 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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/samsung')
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-exynos5440.c | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-samsung.c | 15 |
2 files changed, 5 insertions, 16 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos5440.c b/drivers/pinctrl/samsung/pinctrl-exynos5440.c index 603da2f9dd95..8ef370244aee 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos5440.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos5440.c | |||
| @@ -873,11 +873,7 @@ static int exynos5440_gpiolib_register(struct platform_device *pdev, | |||
| 873 | static int exynos5440_gpiolib_unregister(struct platform_device *pdev, | 873 | static int exynos5440_gpiolib_unregister(struct platform_device *pdev, |
| 874 | struct exynos5440_pinctrl_priv_data *priv) | 874 | struct exynos5440_pinctrl_priv_data *priv) |
| 875 | { | 875 | { |
| 876 | int ret = gpiochip_remove(priv->gc); | 876 | gpiochip_remove(priv->gc); |
| 877 | if (ret) { | ||
| 878 | dev_err(&pdev->dev, "gpio chip remove failed\n"); | ||
| 879 | return ret; | ||
| 880 | } | ||
| 881 | return 0; | 877 | return 0; |
| 882 | } | 878 | } |
| 883 | 879 | ||
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index b07406da333c..83faddf456e0 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c | |||
| @@ -945,9 +945,7 @@ static int samsung_gpiolib_register(struct platform_device *pdev, | |||
| 945 | 945 | ||
| 946 | fail: | 946 | fail: |
| 947 | for (--i, --bank; i >= 0; --i, --bank) | 947 | for (--i, --bank; i >= 0; --i, --bank) |
| 948 | if (gpiochip_remove(&bank->gpio_chip)) | 948 | gpiochip_remove(&bank->gpio_chip); |
| 949 | dev_err(&pdev->dev, "gpio chip %s remove failed\n", | ||
| 950 | bank->gpio_chip.label); | ||
| 951 | return ret; | 949 | return ret; |
| 952 | } | 950 | } |
| 953 | 951 | ||
| @@ -957,16 +955,11 @@ static int samsung_gpiolib_unregister(struct platform_device *pdev, | |||
| 957 | { | 955 | { |
| 958 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; | 956 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; |
| 959 | struct samsung_pin_bank *bank = ctrl->pin_banks; | 957 | struct samsung_pin_bank *bank = ctrl->pin_banks; |
| 960 | int ret = 0; | ||
| 961 | int i; | 958 | int i; |
| 962 | 959 | ||
| 963 | for (i = 0; !ret && i < ctrl->nr_banks; ++i, ++bank) | 960 | for (i = 0; i < ctrl->nr_banks; ++i, ++bank) |
| 964 | ret = gpiochip_remove(&bank->gpio_chip); | 961 | gpiochip_remove(&bank->gpio_chip); |
| 965 | 962 | return 0; | |
| 966 | if (ret) | ||
| 967 | dev_err(&pdev->dev, "gpio chip remove failed\n"); | ||
| 968 | |||
| 969 | return ret; | ||
| 970 | } | 963 | } |
| 971 | 964 | ||
| 972 | static const struct of_device_id samsung_pinctrl_dt_match[]; | 965 | static const struct of_device_id samsung_pinctrl_dt_match[]; |
