diff mbox

[2/2] pinctrl/amd: switch to using a bool for level

Message ID 1477596313-7229-3-git-send-email-alex.hung@canonical.com
State New
Headers show

Commit Message

Alex Hung Oct. 27, 2016, 7:25 p.m. UTC 
From: "Agrawal, Nitesh-kumar" <Nitesh-kumar.Agrawal@amd.com>

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

BugLink: http://bugs.launchpad.net/bugs/1612006

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>

(cherry picked from commit e084448b5d26bfebe8a7b9c43bb57e685567563d)
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 drivers/pinctrl/pinctrl-amd.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index bd544ee..fe17356 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -388,7 +388,7 @@  static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	int ret = 0;
 	u32 pin_reg;
 	unsigned long flags;
-	u32 level_trig;
+	bool level_trig;
 	u32 active_level;
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 	struct amd_gpio *gpio_dev = to_amd_gpio(gc);
@@ -401,13 +401,12 @@  static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	 * default settings, ignore incoming settings from client and use
 	 * 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);
 
-	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;
-	}
 
 	switch (type & IRQ_TYPE_SENSE_MASK) {
 	case IRQ_TYPE_EDGE_RISING: