Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 261c40c1 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

use WARN() in kernel/irq/chip.c 



Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c8573e2

kernel/irq/chip.c

+4 −8
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq) 
	unsigned long flags;



	if (irq >= NR_IRQS) {

		printk(KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);

		WARN_ON(1);

		WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);

		return;

	}
@@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq) 
	unsigned long flags;



	if (irq >= NR_IRQS) {

		printk(KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);

		WARN_ON(1);

		WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);

		return;

	}
@@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irq) 
	spin_lock_irqsave(&desc->lock, flags);

	if (desc->action) {

		spin_unlock_irqrestore(&desc->lock, flags);

		printk(KERN_ERR "Destroying IRQ%d without calling free_irq\n",

		WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",

			irq);

		WARN_ON(1);

		return;

	}

	desc->msi_desc = NULL;
@@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip) 
	unsigned long flags;



	if (irq >= NR_IRQS) {

		printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq);

		WARN_ON(1);

		WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);

		return -EINVAL;

	}