1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index f9dbd503fc40..31682178c59b 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -135,9 +135,6 @@ static bool ichx_gpio_check_available(struct gpio_chip *gpio, unsigned nr)
 
 static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 {
-        if (!ichx_gpio_check_available(gpio, nr))
-                return -ENXIO;
-
         /*
          * Try setting pin as an input and verify it worked since many pins
          * are output-only.
@@ -151,9 +148,6 @@ static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
                                         int val)
 {
-        if (!ichx_gpio_check_available(gpio, nr))
-                return -ENXIO;
-
         /* Set GPIO output value. */
         ichx_write_bit(GPIO_LVL, nr, val, 0);
 
@@ -169,9 +163,6 @@ static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
 
 static int ichx_gpio_get(struct gpio_chip *chip, unsigned nr)
 {
-        if (!ichx_gpio_check_available(chip, nr))
-                return -ENXIO;
-
         return ichx_read_bit(GPIO_LVL, nr);
 }
 
@@ -180,9 +171,6 @@ static int ich6_gpio_get(struct gpio_chip *chip, unsigned nr)
         unsigned long flags;
         u32 data;
 
-        if (!ichx_gpio_check_available(chip, nr))
-                return -ENXIO;
-
         /*
          * GPI 0 - 15 need to be read from the power management registers on
          * a ICH6/3100 bridge.
@@ -207,6 +195,9 @@ static int ich6_gpio_get(struct gpio_chip *chip, unsigned nr)
 
 static int ichx_gpio_request(struct gpio_chip *chip, unsigned nr)
 {
+        if (!ichx_gpio_check_available(chip, nr))
+                return -ENXIO;
+
         /*
          * Note we assume the BIOS properly set a bridge's USE value.  Some
          * chips (eg Intel 3100) have bogus USE values though, so first see if