]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: cy8c95x0: Get rid of cy8c95x0_pinmux_direction() forward declaration
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 5 Feb 2025 09:51:17 +0000 (11:51 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 16 Feb 2025 23:17:26 +0000 (00:17 +0100)
The function is used before being defined. Just move it up enough to
get rid of forward declaration.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/20250205095243.512292-8-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-cy8c95x0.c

index 7e79f20f4d78049c6e1453e2509c4012e762452c..3f2bdaea58b419889e15670ef2b51598075fdac0 100644 (file)
@@ -310,9 +310,6 @@ static const char * const cy8c95x0_groups[] = {
        "gp77",
 };
 
-static int cy8c95x0_pinmux_direction(struct cy8c95x0_pinctrl *chip,
-                                    unsigned int pin, bool input);
-
 static inline u8 cypress_get_port(struct cy8c95x0_pinctrl *chip, unsigned int pin)
 {
        /* Account for GPORT2 which only has 4 bits */
@@ -672,6 +669,31 @@ static int cy8c95x0_read_regs_mask(struct cy8c95x0_pinctrl *chip, int reg,
        return 0;
 }
 
+static int cy8c95x0_pinmux_direction(struct cy8c95x0_pinctrl *chip, unsigned int pin, bool input)
+{
+       u8 port = cypress_get_port(chip, pin);
+       u8 bit = cypress_get_pin_mask(chip, pin);
+       int ret;
+
+       ret = cy8c95x0_regmap_write_bits(chip, CY8C95X0_DIRECTION, port, bit, input ? bit : 0);
+       if (ret)
+               return ret;
+
+       /*
+        * Disable driving the pin by forcing it to HighZ. Only setting
+        * the direction register isn't sufficient in Push-Pull mode.
+        */
+       if (input && test_bit(pin, chip->push_pull)) {
+               ret = cy8c95x0_regmap_write_bits(chip, CY8C95X0_DRV_HIZ, port, bit, bit);
+               if (ret)
+                       return ret;
+
+               __clear_bit(pin, chip->push_pull);
+       }
+
+       return 0;
+}
+
 static int cy8c95x0_gpio_direction_input(struct gpio_chip *gc, unsigned int off)
 {
        return pinctrl_gpio_direction_input(gc, off);
@@ -1229,32 +1251,6 @@ static int cy8c95x0_gpio_request_enable(struct pinctrl_dev *pctldev,
        return cy8c95x0_set_mode(chip, pin, false);
 }
 
-static int cy8c95x0_pinmux_direction(struct cy8c95x0_pinctrl *chip,
-                                    unsigned int pin, bool input)
-{
-       u8 port = cypress_get_port(chip, pin);
-       u8 bit = cypress_get_pin_mask(chip, pin);
-       int ret;
-
-       ret = cy8c95x0_regmap_write_bits(chip, CY8C95X0_DIRECTION, port, bit, input ? bit : 0);
-       if (ret)
-               return ret;
-
-       /*
-        * Disable driving the pin by forcing it to HighZ. Only setting
-        * the direction register isn't sufficient in Push-Pull mode.
-        */
-       if (input && test_bit(pin, chip->push_pull)) {
-               ret = cy8c95x0_regmap_write_bits(chip, CY8C95X0_DRV_HIZ, port, bit, bit);
-               if (ret)
-                       return ret;
-
-               __clear_bit(pin, chip->push_pull);
-       }
-
-       return 0;
-}
-
 static int cy8c95x0_gpio_set_direction(struct pinctrl_dev *pctldev,
                                       struct pinctrl_gpio_range *range,
                                       unsigned int pin, bool input)