Skip to contentSkip to conversation

genirq: better warning on irqchip->set_type() failure

PATCH In review David Brownell 2 participants 3 messages Jul 25, 2008 IRQ

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 genirq: better warning on irqchip->set_type() failure

From: David Brownell <[email protected]>

While I'm glad to finally see the hole fixed whereby passing an invalid IRQ trigger type to request_irq() would be ignored, the current diagnostic isn't quite useful. Fixed by also listing the trigger type which was rejected.

kernel/irq/manage.c +2 -2
@@ -326,8 +326,8 @@ static int __irq_set_trigger(struct irq_chip *chip, unsigned int irq,
 	ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK);
 
 	if (ret)
-		pr_err("setting flow type for irq %u failed (%pF)\n",
-				irq, chip->set_type);
+		pr_err("setting trigger type %d for irq %u failed (%pF)\n",
+				flags & IRQF_TRIGGER_MASK, irq, chip->set_type);
 
 	return ret;
 }
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · David Brownell

From: David Brownell <[email protected]>

While I'm glad to finally see the hole fixed whereby passing an invalid IRQ trigger type to request_irq() would be ignored, the current diagnostic isn't quite useful. Fixed by also listing the trigger type which was rejected.

Best regards and thanks
Uwe

Signature · 3 lines
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
author Acked-by Uwe Kleine-König
#2 lore raw

From: David Brownell <[email protected]>

While I'm glad to finally see the hole fixed whereby passing an invalid IRQ trigger type to request_irq() would be ignored, the current diagnostic isn't quite useful. Fixed by also listing the trigger type which was rejected.

---
Minor change: cast trigger mode to int, one compiler warned.

 kernel/irq/manage.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/irq/manage.c +2 -1
@@ -326,7 +326,8 @@ static int __irq_set_trigger(struct irq_
 	ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK);
 
 	if (ret)
-		pr_err("setting flow type for irq %u failed (%pF)\n",
+		pr_err("setting trigger mode %d for irq %u failed (%pF)\n",
+				(int)(flags & IRQF_TRIGGER_MASK),
 				irq, chip->set_type);
 
 	return ret;