Jelajahi Sumber

pinctrl/amd: switch to using a bool for level

The earlier patch can be simplified by using a bool
to indicate level trigger.

Reviewed-by: Pankaj Sen <Pankaj.Sen@amd.com>
Signed-off-by: Nitesh Kumar Agrawal <Nitesh-kumar.Agrawal@amd.com>
[Fixup to earlier manually applied patch]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Agrawal, Nitesh-kumar 9 tahun lalu
induk
melakukan
e084448b5d
1 mengubah file dengan 4 tambahan dan 5 penghapusan
  1. 4 5
      drivers/pinctrl/pinctrl-amd.c

+ 4 - 5
drivers/pinctrl/pinctrl-amd.c

@@ -403,7 +403,7 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	int ret = 0;
 	int ret = 0;
 	u32 pin_reg;
 	u32 pin_reg;
 	unsigned long flags;
 	unsigned long flags;
-	u32 level_trig;
+	bool level_trig;
 	u32 active_level;
 	u32 active_level;
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 	struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
 	struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
@@ -416,13 +416,12 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	 * default settings, ignore incoming settings from client and use
 	 * default settings, ignore incoming settings from client and use
 	 * BIOS settings to configure GPIO register.
 	 * BIOS settings to configure GPIO register.
 	 */
 	 */
-	level_trig = pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF);
+	level_trig = !(pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF));
 	active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF);
 	active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF);
 
 
-	if((!level_trig) &&
-	   ((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH)) {
+	if(level_trig &&
+	   ((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH))
 		type = IRQ_TYPE_EDGE_FALLING;
 		type = IRQ_TYPE_EDGE_FALLING;
-	}
 
 
 	switch (type & IRQ_TYPE_SENSE_MASK) {
 	switch (type & IRQ_TYPE_SENSE_MASK) {
 	case IRQ_TYPE_EDGE_RISING:
 	case IRQ_TYPE_EDGE_RISING: