mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Use the module-wide pr_fmt() mechanism rather than open-coding "genirq: " everywhere. Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									499eea6bf9
								
							
						
					
					
						commit
						97fd75b7b8
					
				
					 1 changed files with 8 additions and 6 deletions
				
			
		| 
						 | 
					@ -7,6 +7,8 @@
 | 
				
			||||||
 * This file contains driver APIs to the irq subsystem.
 | 
					 * This file contains driver APIs to the irq subsystem.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define pr_fmt(fmt) "genirq: " fmt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <linux/irq.h>
 | 
					#include <linux/irq.h>
 | 
				
			||||||
#include <linux/kthread.h>
 | 
					#include <linux/kthread.h>
 | 
				
			||||||
#include <linux/module.h>
 | 
					#include <linux/module.h>
 | 
				
			||||||
| 
						 | 
					@ -565,7 +567,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
 | 
				
			||||||
		 * IRQF_TRIGGER_* but the PIC does not support multiple
 | 
							 * IRQF_TRIGGER_* but the PIC does not support multiple
 | 
				
			||||||
		 * flow-types?
 | 
							 * flow-types?
 | 
				
			||||||
		 */
 | 
							 */
 | 
				
			||||||
		pr_debug("genirq: No set_type function for IRQ %d (%s)\n", irq,
 | 
							pr_debug("No set_type function for IRQ %d (%s)\n", irq,
 | 
				
			||||||
			 chip ? (chip->name ? : "unknown") : "unknown");
 | 
								 chip ? (chip->name ? : "unknown") : "unknown");
 | 
				
			||||||
		return 0;
 | 
							return 0;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -600,7 +602,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
 | 
				
			||||||
		ret = 0;
 | 
							ret = 0;
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
	default:
 | 
						default:
 | 
				
			||||||
		pr_err("genirq: Setting trigger mode %lu for irq %u failed (%pF)\n",
 | 
							pr_err("Setting trigger mode %lu for irq %u failed (%pF)\n",
 | 
				
			||||||
		       flags, irq, chip->irq_set_type);
 | 
							       flags, irq, chip->irq_set_type);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if (unmask)
 | 
						if (unmask)
 | 
				
			||||||
| 
						 | 
					@ -837,7 +839,7 @@ void exit_irq_thread(void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	action = kthread_data(tsk);
 | 
						action = kthread_data(tsk);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pr_err("genirq: exiting task \"%s\" (%d) is an active IRQ thread (irq %d)\n",
 | 
						pr_err("exiting task \"%s\" (%d) is an active IRQ thread (irq %d)\n",
 | 
				
			||||||
	       tsk->comm ? tsk->comm : "", tsk->pid, action->irq);
 | 
						       tsk->comm ? tsk->comm : "", tsk->pid, action->irq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	desc = irq_to_desc(action->irq);
 | 
						desc = irq_to_desc(action->irq);
 | 
				
			||||||
| 
						 | 
					@ -1044,7 +1046,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 | 
				
			||||||
		 * has. The type flags are unreliable as the
 | 
							 * has. The type flags are unreliable as the
 | 
				
			||||||
		 * underlying chip implementation can override them.
 | 
							 * underlying chip implementation can override them.
 | 
				
			||||||
		 */
 | 
							 */
 | 
				
			||||||
		pr_err("genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq %d\n",
 | 
							pr_err("Threaded irq requested with handler=NULL and !ONESHOT for irq %d\n",
 | 
				
			||||||
		       irq);
 | 
							       irq);
 | 
				
			||||||
		ret = -EINVAL;
 | 
							ret = -EINVAL;
 | 
				
			||||||
		goto out_mask;
 | 
							goto out_mask;
 | 
				
			||||||
| 
						 | 
					@ -1095,7 +1097,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (nmsk != omsk)
 | 
							if (nmsk != omsk)
 | 
				
			||||||
			/* hope the handler works with current  trigger mode */
 | 
								/* hope the handler works with current  trigger mode */
 | 
				
			||||||
			pr_warning("genirq: irq %d uses trigger mode %u; requested %u\n",
 | 
								pr_warning("irq %d uses trigger mode %u; requested %u\n",
 | 
				
			||||||
				   irq, nmsk, omsk);
 | 
									   irq, nmsk, omsk);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1133,7 +1135,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mismatch:
 | 
					mismatch:
 | 
				
			||||||
	if (!(new->flags & IRQF_PROBE_SHARED)) {
 | 
						if (!(new->flags & IRQF_PROBE_SHARED)) {
 | 
				
			||||||
		pr_err("genirq: Flags mismatch irq %d. %08x (%s) vs. %08x (%s)\n",
 | 
							pr_err("Flags mismatch irq %d. %08x (%s) vs. %08x (%s)\n",
 | 
				
			||||||
		       irq, new->flags, new->name, old->flags, old->name);
 | 
							       irq, new->flags, new->name, old->flags, old->name);
 | 
				
			||||||
#ifdef CONFIG_DEBUG_SHIRQ
 | 
					#ifdef CONFIG_DEBUG_SHIRQ
 | 
				
			||||||
		dump_stack();
 | 
							dump_stack();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue