gpiolib: legacy: Kill GPIOF_INIT_* definitions

Besides the fact that (old) drivers use wrong definitions, e.g.,
GPIOF_INIT_HIGH instead of GPIOF_OUT_INIT_HIGH, shrink the legacy
definitions by killing those GPIOF_INIT_* 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-2-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 9471938df64c861cb757a510ef4c0da19ddd2ce9..02c5a4724192e65236da1174997317f3bf1c3f43 100644 (file)
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -76,8 +76,7 @@ static int vision_lcd_setup(struct platform_device *pdev)
 {
        int err;
 
-       err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_INIT_HIGH,
-                               dev_name(&pdev->dev));
+       err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, dev_name(&pdev->dev));
        if (err)
                return err;
 

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 99f321b6e417bd4250ab7cec31ae74ad2d396ec3..9cc8fbf218a596d558c68812c2a52d508a03a278 100644 (file)
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -42,7 +42,7 @@ static struct board_info __initdata board_cvg834g = {
        .expected_cpu_id = 0x3368,
 
        .ephy_reset_gpio = 36,
-       .ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
+       .ephy_reset_gpio_flags = GPIOF_OUT_INIT_HIGH,
        .has_pci = 1,
        .has_uart0 = 1,
        .has_uart1 = 1,

diff --git a/drivers/gpio/gpiolib-legacy.c b/drivers/gpio/gpiolib-legacy.c
index 5a9911ae912509c978e800731871ab671a713fbd..354dd0cc8f2f304547d24686cd198f61af4a25b3 100644 (file)
--- a/drivers/gpio/gpiolib-legacy.c
+++ b/drivers/gpio/gpiolib-legacy.c
@@ -43,8 +43,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
        if (flags & GPIOF_DIR_IN)
                err = gpiod_direction_input(desc);
        else
-               err = gpiod_direction_output_raw(desc,
-                               (flags & GPIOF_INIT_HIGH) ? 1 : 0);
+               err = gpiod_direction_output_raw(desc, !!(flags & GPIOF_OUT_INIT_HIGH));
 
        if (err)
                goto free_gpio;

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 063f71b18a7ce9ef9258743599f0b0196958e80e..4af8ad11455743488648190085a2e33cca4d2606 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -20,12 +20,9 @@ struct device;
 #define GPIOF_DIR_OUT  (0 << 0)
 #define GPIOF_DIR_IN   (1 << 0)
 
-#define GPIOF_INIT_LOW (0 << 1)
-#define GPIOF_INIT_HIGH        (1 << 1)
-
 #define GPIOF_IN               (GPIOF_DIR_IN)
-#define GPIOF_OUT_INIT_LOW     (GPIOF_DIR_OUT | GPIOF_INIT_LOW)
-#define GPIOF_OUT_INIT_HIGH    (GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
+#define GPIOF_OUT_INIT_LOW     (GPIOF_DIR_OUT | (0 << 1))
+#define GPIOF_OUT_INIT_HIGH    (GPIOF_DIR_OUT | (1 << 1))
 
 /* Gpio pin is active-low */
 #define GPIOF_ACTIVE_LOW        (1 << 2)