gpiolib: legacy: Kill GPIOF_DIR_* definitions

Besides the fact that (old) drivers use wrong definitions, e.g.,
GPIOF_DIR_IN instead of GPIOF_IN, shrink the legacy definitions
by killing those GPIOF_DIR_* completely.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Link: https://lore.kernel.org/r/20240828142554.2424189-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 02c5a4724192e65236da1174997317f3bf1c3f43..85f0dd7255a9e3dcca10d50f0ba4614c5cfd5bf0 100644 (file)
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -292,8 +292,7 @@ static void __init vision_init_machine(void)
         * Request the gpio expander's interrupt gpio line now to prevent
         * the kernel from doing a WARN in gpiolib:gpio_ensure_requested().
         */
-       if (gpio_request_one(EP93XX_GPIO_LINE_F(7), GPIOF_DIR_IN,
-                               "pca9539:74"))
+       if (gpio_request_one(EP93XX_GPIO_LINE_F(7), GPIOF_IN, "pca9539:74"))
                pr_warn("cannot request interrupt gpio for pca9539:74\n");
 
        vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));

diff --git a/drivers/gpio/gpiolib-legacy.c b/drivers/gpio/gpiolib-legacy.c
index 354dd0cc8f2f304547d24686cd198f61af4a25b3..f421208ddbdd9720123b6d3500b8dbf2cf157213 100644 (file)
--- a/drivers/gpio/gpiolib-legacy.c
+++ b/drivers/gpio/gpiolib-legacy.c
@@ -40,7 +40,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
        if (flags & GPIOF_ACTIVE_LOW)
                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
 
-       if (flags & GPIOF_DIR_IN)
+       if (flags & GPIOF_IN)
                err = gpiod_direction_input(desc);
        else
                err = gpiod_direction_output_raw(desc, !!(flags & GPIOF_OUT_INIT_HIGH));

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 4af8ad11455743488648190085a2e33cca4d2606..2d105be7bbc335fdbef39e6e5caf601d97922802 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -17,12 +17,9 @@
 struct device;
 
 /* make these flag values available regardless of GPIO kconfig options */
-#define GPIOF_DIR_OUT  (0 << 0)
-#define GPIOF_DIR_IN   (1 << 0)
-
-#define GPIOF_IN               (GPIOF_DIR_IN)
-#define GPIOF_OUT_INIT_LOW     (GPIOF_DIR_OUT | (0 << 1))
-#define GPIOF_OUT_INIT_HIGH    (GPIOF_DIR_OUT | (1 << 1))
+#define GPIOF_IN               ((1 << 0))
+#define GPIOF_OUT_INIT_LOW     ((0 << 0) | (0 << 1))
+#define GPIOF_OUT_INIT_HIGH    ((0 << 0) | (1 << 1))
 
 /* Gpio pin is active-low */
 #define GPIOF_ACTIVE_LOW        (1 << 2)