commit c2078bd3d04025b343b6923be6f9a9f35301a82f
author Gerard Marull-Paretas <gerard.marull@nordicsemi.no> Tue Jan 18 16:11:02 2022 +0100
committer Carles Cufí <carles.cufi@nordicsemi.no> Wed Jan 19 18:16:02 2022 +0100
tree beae36401578599538d5f4e12fb04ff02e51ad22
parent 72a0d6828470ad25f90687c4e45775e7b94618ab

drivers: interrupt_controller: drop DEV_DATA/DEV_CFG usage

Stop using redundant DEV_DATA/DEV_CFG macros and use dev->data and
dev->config instead.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

drivers/interrupt_controller/intc_rv32m1_intmux.c

diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
index a9ba89e..7327a1e 100644
--- a/drivers/interrupt_controller/intc_rv32m1_intmux.c
+++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c
@@ -45,10 +45,7 @@
 	struct _isr_table_entry *isr_base;
 };
 
-#define DEV_CFG(dev) \
-	((struct rv32m1_intmux_config *)(dev->config))
-
-#define DEV_REGS(dev) (DEV_CFG(dev)->regs)
+#define DEV_REGS(dev) (((const struct rv32m1_intmux_config *)(dev->config))->regs)
 
 /*
  * <irq_nextlevel.h> API
@@ -110,10 +107,11 @@
 static void rv32m1_intmux_isr(const void *arg)
 {
 	const struct device *dev = DEVICE_DT_INST_GET(0);
+	const struct rv32m1_intmux_config *config = dev->config;
 	INTMUX_Type *regs = DEV_REGS(dev);
 	uint32_t channel = POINTER_TO_UINT(arg);
 	uint32_t line = (regs->CHANNEL[channel].CHn_VEC >> 2);
-	struct _isr_table_entry *isr_base = DEV_CFG(dev)->isr_base;
+	struct _isr_table_entry *isr_base = config->isr_base;
 	struct _isr_table_entry *entry;
 
 	/*
@@ -152,7 +150,7 @@
 
 static int rv32m1_intmux_init(const struct device *dev)
 {
-	const struct rv32m1_intmux_config *config = DEV_CFG(dev);
+	const struct rv32m1_intmux_config *config = dev->config;
 	INTMUX_Type *regs = DEV_REGS(dev);
 	size_t i;
 

drivers/interrupt_controller/intc_sam0_eic.c

diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index 946838a..ab1af18 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -27,9 +27,6 @@
 	struct sam0_eic_line_assignment lines[EIC_EXTINT_NUM];
 };
 
-#define DEV_DATA(dev) \
-	((struct sam0_eic_data *const)(dev)->data)
-
 static void wait_synchronization(void)
 {
 #ifdef REG_EIC_SYNCBUSY
@@ -52,7 +49,7 @@
 
 static void sam0_eic_isr(const struct device *dev)
 {
-	struct sam0_eic_data *const dev_data = DEV_DATA(dev);
+	struct sam0_eic_data *const dev_data = dev->data;
 	uint16_t bits = EIC->INTFLAG.reg;
 	uint32_t line_index;