mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpiolib: legacy: Kill GPIOF_INIT_* definitions

Browse source 
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>
This commit is contained in:
Andy Shevchenko 2024-08-28 17:23:57 +03:00 committed by Bartosz Golaszewski
parent 1882e76936
commit 4b2b0a2ce8
4 changed files with 5 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-ep93xx/vision_ep9307.c
View file

@ -76,8 +76,7 @@ static int vision_lcd_setup(struct platform_device *pdev)
{ {
int err; int err;
err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_INIT_HIGH, err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, dev_name(&pdev->dev));
dev_name(&pdev->dev));
if (err) if (err)
return err; return err;

2
arch/mips/bcm63xx/boards/board_bcm963xx.c
View file

@ -42,7 +42,7 @@ static struct board_info __initdata board_cvg834g = {
.expected_cpu_id = 0x3368, .expected_cpu_id = 0x3368,
.ephy_reset_gpio = 36, .ephy_reset_gpio = 36,
.ephy_reset_gpio_flags = GPIOF_INIT_HIGH, .ephy_reset_gpio_flags = GPIOF_OUT_INIT_HIGH,
.has_pci = 1, .has_pci = 1,
.has_uart0 = 1, .has_uart0 = 1,
.has_uart1 = 1, .has_uart1 = 1,

3
drivers/gpio/gpiolib-legacy.c
View file

@ -43,8 +43,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
if (flags & GPIOF_DIR_IN) if (flags & GPIOF_DIR_IN)
err = gpiod_direction_input(desc); err = gpiod_direction_input(desc);
else else
err = gpiod_direction_output_raw(desc, err = gpiod_direction_output_raw(desc, !!(flags & GPIOF_OUT_INIT_HIGH));
(flags & GPIOF_INIT_HIGH) ? 1 : 0);
if (err) if (err)
goto free_gpio; goto free_gpio;

7
include/linux/gpio.h
View file

@ -20,12 +20,9 @@ struct device;
#define GPIOF_DIR_OUT (0 << 0) #define GPIOF_DIR_OUT (0 << 0)
#define GPIOF_DIR_IN (1 << 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_IN (GPIOF_DIR_IN)
#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW) #define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | (0 << 1))
#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH) #define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | (1 << 1))
/* Gpio pin is active-low */ /* Gpio pin is active-low */
#define GPIOF_ACTIVE_LOW (1 << 2) #define GPIOF_ACTIVE_LOW (1 << 2)