Skip to contentSkip to conversation

gpio: merrifield: Don't use GPIOF_DIR_IN / GPIOF_DIR_OUT

PATCH In review Andy Shevchenko 2 participants 2 messages Mar 23, 2017

Subsystems (3)
GPIO Intel MID (Mobile Internet Device) platform Intel GPIO drivers
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 gpio: merrifield: Don't use GPIOF_DIR_IN / GPIOF_DIR_OUT

The mentioned flags are dedicated solely for consumer API. Replace them by explicit values.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/gpio/gpio-merrifield.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-merrifield.c +1 -1
index f40088d268c1..96dc5123a58a 100644
@@ -166,7 +166,7 @@ static int mrfld_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
 {
 	void __iomem *gpdr = gpio_reg(chip, offset, GPDR);
 
-	return (readl(gpdr) & BIT(offset % 32)) ? GPIOF_DIR_OUT : GPIOF_DIR_IN;
+	return (readl(gpdr) & BIT(offset % 32)) ? 0 : 1;
 }
 
 static int mrfld_gpio_set_debounce(struct gpio_chip *chip, unsigned int offset,
Signature · 1 line
2.11.0
#1 lore raw
Quoted 13 lines · Andy Shevchenko

The mentioned flags are dedicated solely for consumer API. Replace them by explicit values.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/gpio/gpio-merrifield.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-merrifield.c +0 -0
index f40088d268c1..96dc5123a58a 100644

drivers/gpio/gpio-merrifield.c static int mrfld_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) · line 169

Quoted 5 lines
drivers/gpio/gpio-merrifield.c +1 -1
@@ -166,7 +166,7 @@ static int mrfld_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
 {
        void __iomem *gpdr = gpio_reg(chip, offset, GPDR);
 
-       return (readl(gpdr) & BIT(offset % 32)) ? GPIOF_DIR_OUT : GPIOF_DIR_IN;
+       return (readl(gpdr) & BIT(offset % 32)) ? 0 : 1;

I would normally just do this to clamp to [0,1]:

return !(readl(gpdr) & BIT(offset % 32));

So did that fix in the commit.

Yours,
Linus Walleij