diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-02-10 12:47:26 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-02-10 12:47:26 +0100 |
commit | dee7c111a458115daecb74a6e3b707260e64e983 (patch) | |
tree | 18cf43504b8612a0b35d5472ee8e7d5dc694df81 /drivers/gpio/gpio-bd71828.c | |
parent | bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 (diff) | |
parent | 8131b73b22c25e57e926874bb284f61cc3f8ac5e (diff) |
Merge tag 'gpio-fixes-for-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes
gpio fixes for v5.6-rc2
- fix a regression introduced by gpio_do_set_config()
- sort GPIO entries in MAINTAINERS
- remove leftover defines in gpio-bd71828
- remove an redundant switch case in gpio_set_config()
Diffstat (limited to 'drivers/gpio/gpio-bd71828.c')
-rw-r--r-- | drivers/gpio/gpio-bd71828.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-bd71828.c b/drivers/gpio/gpio-bd71828.c index 04aade9e0a4d..3dbbc638e9a9 100644 --- a/drivers/gpio/gpio-bd71828.c +++ b/drivers/gpio/gpio-bd71828.c @@ -10,16 +10,6 @@ #define GPIO_OUT_REG(off) (BD71828_REG_GPIO_CTRL1 + (off)) #define HALL_GPIO_OFFSET 3 -/* - * These defines can be removed when - * "gpio: Add definition for GPIO direction" - * (9208b1e77d6e8e9776f34f46ef4079ecac9c3c25 in GPIO tree) gets merged, - */ -#ifndef GPIO_LINE_DIRECTION_IN - #define GPIO_LINE_DIRECTION_IN 1 - #define GPIO_LINE_DIRECTION_OUT 0 -#endif - struct bd71828_gpio { struct rohm_regmap_dev chip; struct gpio_chip gpio; |