From 3ef34ff6d1c60df8a620b8e9e453b1f8ee931a32 Mon Sep 17 00:00:00 2001 From: Piotr Wojnarowski Date: Thu, 16 Nov 2023 16:17:50 +0100 Subject: [PATCH] drivers: intc: plic: Make function names and types consistent `get_claim_complete_offset` and `get_threshold_priority_offset` actually return addresses directly. Rename them to `_addr` for consistency within the driver. Also change their return type to `mem_addr_t`. Signed-off-by: Piotr Wojnarowski --- drivers/interrupt_controller/intc_plic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c index 41ee75823b0..fa11faca91e 100644 --- a/drivers/interrupt_controller/intc_plic.c +++ b/drivers/interrupt_controller/intc_plic.c @@ -71,14 +71,14 @@ static inline uint32_t get_plic_enabled_size(const struct device *dev) return local_irq_to_reg_offset(config->num_irqs) + 1; } -static inline uint32_t get_claim_complete_offset(const struct device *dev) +static inline mem_addr_t get_claim_complete_addr(const struct device *dev) { const struct plic_config *config = dev->config; return config->reg + PLIC_REG_REGS_CLAIM_COMPLETE_OFFSET; } -static inline uint32_t get_threshold_priority_offset(const struct device *dev) +static inline mem_addr_t get_threshold_priority_addr(const struct device *dev) { const struct plic_config *config = dev->config; @@ -240,7 +240,7 @@ const struct device *riscv_plic_get_dev(void) static void plic_irq_handler(const struct device *dev) { const struct plic_config *config = dev->config; - mem_addr_t claim_complete_addr = get_claim_complete_offset(dev); + mem_addr_t claim_complete_addr = get_claim_complete_addr(dev); struct _isr_table_entry *ite; int edge_irq; @@ -305,7 +305,7 @@ static int plic_init(const struct device *dev) const struct plic_config *config = dev->config; mem_addr_t en_addr = config->irq_en; mem_addr_t prio_addr = config->prio; - mem_addr_t thres_prio_addr = get_threshold_priority_offset(dev); + mem_addr_t thres_prio_addr = get_threshold_priority_addr(dev); /* Ensure that all interrupts are disabled initially */ for (uint32_t i = 0; i < get_plic_enabled_size(dev); i++) {