From 82f480944718d9e8340a6ac1af41ece7851115bf Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 18 Jun 2024 13:48:35 +0100 Subject: [PATCH] xen/irq: Address MISRA Rule 8.3 violation When centralising irq_ack_none(), different architectures had different names for the parameter. As it's type is struct irq_desc *, it should be named desc. Make this consistent. No functional change. Fixes: 8aeda4a241ab ("arch/irq: Make irq_ack_none() mandatory") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/irq.c | 4 ++-- xen/include/xen/irq.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index c60502444c..6b89f64fd1 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -31,9 +31,9 @@ struct irq_guest unsigned int virq; }; -void irq_ack_none(struct irq_desc *irq) +void irq_ack_none(struct irq_desc *desc) { - printk("unexpected IRQ trap at irq %02x\n", irq->irq); + printk("unexpected IRQ trap at irq %02x\n", desc->irq); } void irq_end_none(struct irq_desc *irq) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index adf33547d2..580ae37e74 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -134,7 +134,7 @@ void cf_check irq_actor_none(struct irq_desc *desc); * irq_ack_none() must be provided by the architecture. * irq_end_none() is optional, and opted into using a define. */ -void cf_check irq_ack_none(struct irq_desc *irq); +void cf_check irq_ack_none(struct irq_desc *desc); /* * Per-cpu interrupted context register state - the inner-most interrupt frame -- 2.39.5