x86/irq: Use existing helper for pending vector check

Jacob Pan · KAGA-KOKO · commit 6ecc2e7932fe · 2024-05-08T15:15:15.000+02:00
lapic_vector_set_in_irr() is already available, use it for checking pending vectors at the local APIC. No functional change. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Imran Khan <imran.f.khan@oracle.com> Link: https://lore.kernel.org/r/20240506175612.1141095-1-jacob.jun.pan@linux.intel.com
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
@@ -503,13 +503,7 @@ static inline bool lapic_vector_set_in_irr(unsigned int vector)
 
 static inline bool is_vector_pending(unsigned int vector)
 {
-	unsigned int irr;
-
-	irr = apic_read(APIC_IRR + (vector / 32 * 0x10));
-	if (irr  & (1 << (vector % 32)))
-		return true;
-
-	return pi_pending_this_cpu(vector);
+	return lapic_vector_set_in_irr(vector) || pi_pending_this_cpu(vector);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -503,13 +503,7 @@ static inline bool lapic_vector_set_in_irr(unsigned int vector)`
`503`	`503`
`504`	`504`	`static inline bool is_vector_pending(unsigned int vector)`
`505`	`505`	`{`
`506`		`- unsigned int irr;`
`507`		`-`
`508`		`- irr = apic_read(APIC_IRR + (vector / 32 * 0x10));`
`509`		`- if (irr & (1 << (vector % 32)))`
`510`		`- return true;`
`511`		`-`
`512`		`- return pi_pending_this_cpu(vector);`
	`506`	`+ return lapic_vector_set_in_irr(vector) \|\| pi_pending_this_cpu(vector);`
`513`	`507`	`}`
`514`	`508`
`515`	`509`	`/*`