Rename the enum to intc_variant and the structure member from hw_version
to hw_variant to better reflect that these values select between
different controller variants, not versions of the same one.
Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v5:
- Add Suggested-by and Acked-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v4:
- New patch. Prereq for the next patch.
---
---
xen/arch/riscv/aplic.c | 2 +-
xen/arch/riscv/include/asm/intc.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/xen/arch/riscv/aplic.c b/xen/arch/riscv/aplic.c
index 739e8dab3498..6a1255c5f403 100644
--- a/xen/arch/riscv/aplic.c
+++ b/xen/arch/riscv/aplic.c
@@ -35,7 +35,7 @@ static struct aplic_priv aplic = {
};
static struct intc_info __ro_after_init aplic_info = {
- .hw_version = INTC_APLIC,
+ .hw_variant = INTC_APLIC,
};
static void __init aplic_init_hw_interrupts(void)
diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h
index ecdc8a5e6577..675f703ec97f 100644
--- a/xen/arch/riscv/include/asm/intc.h
+++ b/xen/arch/riscv/include/asm/intc.h
@@ -10,7 +10,7 @@
struct dt_device_node;
-enum intc_version {
+enum intc_variant {
INTC_APLIC,
};
@@ -18,7 +18,7 @@ struct cpu_user_regs;
struct irq_desc;
struct intc_info {
- enum intc_version hw_version;
+ enum intc_variant hw_variant;
const struct dt_device_node *node;
/* number of irqs */
--
2.54.0