pinctrl: remove double pin validity check.
authorMarek Belisko <marek.belisko@open-nandra.com>
Wed, 26 Oct 2011 20:57:20 +0000 (22:57 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 3 Jan 2012 08:09:59 +0000 (09:09 +0100)
Function pin_is_valid just call pin_desc_get which is in pin_request
call some line below. Remove pin_is_valid() check.

Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinmux.c

index 72b760b..17c3931 100644 (file)
@@ -108,16 +108,6 @@ static int pin_request(struct pinctrl_dev *pctldev,
 
        dev_dbg(&pctldev->dev, "request pin %d for %s\n", pin, function);
 
-       if (!pin_is_valid(pctldev, pin)) {
-               dev_err(&pctldev->dev, "pin is invalid\n");
-               return -EINVAL;
-       }
-
-       if (!function) {
-               dev_err(&pctldev->dev, "no function name given\n");
-               return -EINVAL;
-       }
-
        desc = pin_desc_get(pctldev, pin);
        if (desc == NULL) {
                dev_err(&pctldev->dev,
@@ -125,6 +115,11 @@ static int pin_request(struct pinctrl_dev *pctldev,
                goto out;
        }
 
+       if (!function) {
+               dev_err(&pctldev->dev, "no function name given\n");
+               return -EINVAL;
+       }
+
        spin_lock(&desc->lock);
        if (desc->mux_function) {
                spin_unlock(&desc->lock);