From 9a18fdea3f1f0c3447664743b59f20075c708eea Mon Sep 17 00:00:00 2001
From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Thu, 6 Jan 2022 11:27:07 +0100
Subject: [PATCH] drivers: Check and fix device const qualifier on ISR

Re-running the script that checks for the const qualifier missing on
struct device ISR's parameter.

The script also changes the parameter 'arg' to 'dev' when relevant.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 drivers/adc/adc_ite_it8xxx2.c                 |   3 +-
 drivers/adc/adc_npcx.c                        |   3 +-
 drivers/can/can_stm32fd.c                     |   7 +-
 drivers/dac/dac_sam.c                         |   3 +-
 drivers/dma/dma_iproc_pax_v1.c                |   3 +-
 drivers/dma/dma_iproc_pax_v2.c                |   3 +-
 drivers/entropy/entropy_cc13xx_cc26xx.c       |   3 +-
 drivers/espi/espi_npcx.c                      |   3 +-
 drivers/espi/host_subs_npcx.c                 |   8 +-
 drivers/gpio/gpio_rcar.c                      |   3 +-
 drivers/i2c/i2c_cc13xx_cc26xx.c               |   3 +-
 drivers/i2c/i2c_dw.c                          |   3 +-
 drivers/i2c/i2c_ite_it8xxx2.c                 |   3 +-
 drivers/i2c/i2c_lpc11u6x.c                    |   3 +-
 drivers/i2c/i2c_mchp_xec.c                    |   3 +-
 drivers/i2c/i2c_mchp_xec_v2.c                 |   3 +-
 drivers/i2s/i2s_mcux_sai.c                    |   3 +-
 .../interrupt_controller/intc_exti_stm32.c    | 104 +++++++++---------
 drivers/interrupt_controller/intc_gd32_exti.c |   2 +-
 drivers/timer/mcux_lptmr_timer.c              |   2 +-
 drivers/timer/mcux_os_timer.c                 |   2 +-
 drivers/watchdog/wdt_mcux_imx_wdog.c          |   3 +-
 22 files changed, 77 insertions(+), 96 deletions(-)

diff --git a/drivers/adc/adc_ite_it8xxx2.c b/drivers/adc/adc_ite_it8xxx2.c
index b65a3dd8494..d1de6e26b3f 100644
--- a/drivers/adc/adc_ite_it8xxx2.c
+++ b/drivers/adc/adc_ite_it8xxx2.c
@@ -371,9 +371,8 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static void adc_it8xxx2_isr(const void *arg)
+static void adc_it8xxx2_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct adc_it8xxx2_data *data = dev->data;
 
 	LOG_DBG("ADC ISR triggered.");
diff --git a/drivers/adc/adc_npcx.c b/drivers/adc/adc_npcx.c
index f303a318420..08e0b267078 100644
--- a/drivers/adc/adc_npcx.c
+++ b/drivers/adc/adc_npcx.c
@@ -70,9 +70,8 @@ struct adc_npcx_data {
 #define HAL_INSTANCE(dev) ((struct adc_reg *)((const struct adc_npcx_config *)(dev)->config)->base)
 
 /* ADC local functions */
-static void adc_npcx_isr(void *arg)
+static void adc_npcx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct adc_npcx_config *config = dev->config;
 	struct adc_npcx_data *const data = dev->data;
 	struct adc_reg *const inst = HAL_INSTANCE(dev);
diff --git a/drivers/can/can_stm32fd.c b/drivers/can/can_stm32fd.c
index 35231571f66..00b72e1afe4 100644
--- a/drivers/can/can_stm32fd.c
+++ b/drivers/can/can_stm32fd.c
@@ -163,9 +163,8 @@ int can_stm32fd_get_max_bitrate(const struct device *dev, uint32_t *max_bitrate)
 	return 0;
 }
 
-static void can_stm32fd_line_0_isr(void *arg)
+static void can_stm32fd_line_0_isr(const struct device *dev)
 {
-	struct device *dev = (struct device *)arg;
 	const struct can_stm32fd_config *cfg = dev->config;
 	const struct can_mcan_config *mcan_cfg = &cfg->mcan_cfg;
 	struct can_stm32fd_data *data = dev->data;
@@ -175,11 +174,9 @@ static void can_stm32fd_line_0_isr(void *arg)
 	can_mcan_line_0_isr(mcan_cfg, msg_ram, mcan_data);
 }
 
-static void can_stm32fd_line_1_isr(void *arg)
+static void can_stm32fd_line_1_isr(const struct device *dev)
 {
-	struct device *dev = (struct device *)arg;
 	const struct can_stm32fd_config *cfg = dev->config;
-	struct can_stm32fd_data *data = dev->data;
 	const struct can_mcan_config *mcan_cfg = &cfg->mcan_cfg;
 	struct can_mcan_data *mcan_data = &data->mcan_data;
 	struct can_mcan_msg_sram *msg_ram = cfg->msg_sram;
diff --git a/drivers/dac/dac_sam.c b/drivers/dac/dac_sam.c
index c64e1564ed8..650f651dff2 100644
--- a/drivers/dac/dac_sam.c
+++ b/drivers/dac/dac_sam.c
@@ -46,9 +46,8 @@ struct dac_sam_dev_data {
 	struct dac_channel dac_channels[DAC_CHANNEL_NO];
 };
 
-static void dac_sam_isr(void *arg)
+static void dac_sam_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct dac_sam_dev_cfg *const dev_cfg = dev->config;
 	struct dac_sam_dev_data *const dev_data = dev->data;
 	Dacc *const dac = dev_cfg->regs;
diff --git a/drivers/dma/dma_iproc_pax_v1.c b/drivers/dma/dma_iproc_pax_v1.c
index 29e138f1ec7..156bedec374 100644
--- a/drivers/dma/dma_iproc_pax_v1.c
+++ b/drivers/dma/dma_iproc_pax_v1.c
@@ -551,10 +551,9 @@ static int peek_ring_cmpl(const struct device *dev,
 	return process_cmpl_event(dev, idx, pl_len);
 }
 #else
-static void rm_isr(void *arg)
+static void rm_isr(const struct device *dev)
 {
 	uint32_t status, err_stat, idx;
-	const struct device *dev = arg;
 	struct dma_iproc_pax_data *pd = dev->data;
 
 	/* read and clear interrupt status */
diff --git a/drivers/dma/dma_iproc_pax_v2.c b/drivers/dma/dma_iproc_pax_v2.c
index b9da0ee07b4..d67c4d9765b 100644
--- a/drivers/dma/dma_iproc_pax_v2.c
+++ b/drivers/dma/dma_iproc_pax_v2.c
@@ -637,10 +637,9 @@ static int peek_ring_cmpl(const struct device *dev,
 	return process_cmpl_event(dev, idx, pl_len);
 }
 #else
-static void rm_isr(void *arg)
+static void rm_isr(const struct device *dev)
 {
 	uint32_t status, err_stat, idx;
-	const struct device *dev = arg;
 	struct dma_iproc_pax_data *pd = dev->data;
 
 	err_stat =
diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c
index 4bd653264ff..2703dbbb522 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -125,9 +125,8 @@ static int entropy_cc13xx_cc26xx_get_entropy(const struct device *dev,
 	return 0;
 }
 
-static void entropy_cc13xx_cc26xx_isr(const void *arg)
+static void entropy_cc13xx_cc26xx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct entropy_cc13xx_cc26xx_data *data = dev->data;
 	uint32_t src = 0;
 	uint32_t cnt;
diff --git a/drivers/espi/espi_npcx.c b/drivers/espi/espi_npcx.c
index fd1c8545f40..745b48f46c3 100644
--- a/drivers/espi/espi_npcx.c
+++ b/drivers/espi/espi_npcx.c
@@ -266,9 +266,8 @@ const struct espi_bus_isr espi_bus_isr_tbl[] = {
 #endif
 };
 
-static void espi_bus_generic_isr(void *arg)
+static void espi_bus_generic_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct espi_reg *const inst = HAL_INSTANCE(dev);
 	int i;
 	uint32_t mask, status;
diff --git a/drivers/espi/host_subs_npcx.c b/drivers/espi/host_subs_npcx.c
index fa956ea7990..007e850338f 100644
--- a/drivers/espi/host_subs_npcx.c
+++ b/drivers/espi/host_subs_npcx.c
@@ -223,7 +223,7 @@ static inline uint8_t host_shd_mem_wnd_size_sl(uint32_t size)
 
 /* Host KBC sub-device local functions */
 #if defined(CONFIG_ESPI_PERIPHERAL_8042_KBC)
-static void host_kbc_ibf_isr(void *arg)
+static void host_kbc_ibf_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	struct kbc_reg *const inst_kbc = host_sub_cfg.inst_kbc;
@@ -249,7 +249,7 @@ static void host_kbc_ibf_isr(void *arg)
 							evt);
 }
 
-static void host_kbc_obe_isr(void *arg)
+static void host_kbc_obe_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	struct kbc_reg *const inst_kbc = host_sub_cfg.inst_kbc;
@@ -438,7 +438,7 @@ static void host_shared_mem_region_init(void)
 #if defined(CONFIG_ESPI_PERIPHERAL_HOST_IO) || \
 				defined(CONFIG_ESPI_PERIPHERAL_EC_HOST_CMD)
 /* Host pm (host io) sub-module isr function for all channels such as ACPI. */
-static void host_pmch_ibf_isr(void *arg)
+static void host_pmch_ibf_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	struct pmch_reg *const inst_acpi = host_sub_cfg.inst_pm_acpi;
@@ -471,7 +471,7 @@ static void host_pmch_ibf_isr(void *arg)
 
 /* Host port80 sub-device local functions */
 #if defined(CONFIG_ESPI_PERIPHERAL_DEBUG_PORT_80)
-static void host_port80_isr(void *arg)
+static void host_port80_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	struct shm_reg *const inst_shm = host_sub_cfg.inst_shm;
diff --git a/drivers/gpio/gpio_rcar.c b/drivers/gpio/gpio_rcar.c
index 7aafd6d3afb..3200c09f346 100644
--- a/drivers/gpio/gpio_rcar.c
+++ b/drivers/gpio/gpio_rcar.c
@@ -73,9 +73,8 @@ static void gpio_rcar_modify_bit(const struct gpio_rcar_cfg *config,
 	gpio_rcar_write(config, offs, tmp);
 }
 
-static void gpio_rcar_port_isr(void *arg)
+static void gpio_rcar_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_rcar_cfg *config = dev->config;
 	struct gpio_rcar_data *data = dev->data;
 	uint32_t pending, fsb, mask;
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index 79ad441b1aa..7654aacdd3e 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -273,9 +273,8 @@ static int i2c_cc13xx_cc26xx_configure(const struct device *dev,
 	return 0;
 }
 
-static void i2c_cc13xx_cc26xx_isr(const void *arg)
+static void i2c_cc13xx_cc26xx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct i2c_cc13xx_cc26xx_config *config = dev->config;
 	struct i2c_cc13xx_cc26xx_data *data = dev->data;
 	const uint32_t base = config->base;
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index 7c82e60cb85..81fec8dc3ce 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -197,9 +197,8 @@ static inline void i2c_dw_write_byte_non_blocking(const struct device *dev, uint
 static void i2c_dw_slave_read_clear_intr_bits(const struct device *dev);
 #endif
 
-static void i2c_dw_isr(void *arg)
+static void i2c_dw_isr(const struct device *port)
 {
-	const struct device *port = (const struct device *)arg;
 	struct i2c_dw_dev_config * const dw = port->data;
 	union ic_interrupt_register intr_stat;
 	uint32_t value;
diff --git a/drivers/i2c/i2c_ite_it8xxx2.c b/drivers/i2c/i2c_ite_it8xxx2.c
index f339d3a2b29..26de042255f 100644
--- a/drivers/i2c/i2c_ite_it8xxx2.c
+++ b/drivers/i2c/i2c_ite_it8xxx2.c
@@ -881,9 +881,8 @@ static int i2c_it8xxx2_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return i2c_parsing_return_value(dev);
 }
 
-static void i2c_it8xxx2_isr(void *arg)
+static void i2c_it8xxx2_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct i2c_it8xxx2_data *data = dev->data;
 	const struct i2c_it8xxx2_config *config = dev->config;
 
diff --git a/drivers/i2c/i2c_lpc11u6x.c b/drivers/i2c/i2c_lpc11u6x.c
index e6f969140a8..1d7873427ab 100644
--- a/drivers/i2c/i2c_lpc11u6x.c
+++ b/drivers/i2c/i2c_lpc11u6x.c
@@ -190,9 +190,8 @@ static int lpc11u6x_i2c_slave_unregister(const struct device *dev,
 	return 0;
 }
 
-static void lpc11u6x_i2c_isr(const void *arg)
+static void lpc11u6x_i2c_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct lpc11u6x_i2c_data *data = dev->data;
 	struct lpc11u6x_i2c_regs *i2c = DEV_BASE(dev);
 	struct lpc11u6x_i2c_current_transfer *transfer = &data->transfer;
diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c
index b41725527e5..02f638577e2 100644
--- a/drivers/i2c/i2c_mchp_xec.c
+++ b/drivers/i2c/i2c_mchp_xec.c
@@ -723,10 +723,9 @@ static int i2c_xec_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return 0;
 }
 
-static void i2c_xec_bus_isr(void *arg)
+static void i2c_xec_bus_isr(const struct device *dev)
 {
 #ifdef CONFIG_I2C_SLAVE
-	const struct device *dev = (const struct device *)arg;
 	const struct i2c_xec_config *config =
 		(const struct i2c_xec_config *const) (dev->config);
 	struct i2c_xec_data *data = dev->data;
diff --git a/drivers/i2c/i2c_mchp_xec_v2.c b/drivers/i2c/i2c_mchp_xec_v2.c
index 6fd1a43081c..e21f96410f7 100644
--- a/drivers/i2c/i2c_mchp_xec_v2.c
+++ b/drivers/i2c/i2c_mchp_xec_v2.c
@@ -798,10 +798,9 @@ static int i2c_xec_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return ret;
 }
 
-static void i2c_xec_bus_isr(void *arg)
+static void i2c_xec_bus_isr(const struct device *dev)
 {
 #ifdef CONFIG_I2C_SLAVE
-	const struct device *dev = (const struct device *)arg;
 	const struct i2c_xec_config *cfg =
 		(const struct i2c_xec_config *const) (dev->config);
 	struct i2c_xec_data *data = dev->data;
diff --git a/drivers/i2s/i2s_mcux_sai.c b/drivers/i2s/i2s_mcux_sai.c
index 38e297cfb5e..684321c8574 100644
--- a/drivers/i2s/i2s_mcux_sai.c
+++ b/drivers/i2s/i2s_mcux_sai.c
@@ -926,9 +926,8 @@ static void sai_driver_irq(const struct device *dev)
 }
 
 /* clear IRQ sources atm */
-static void i2s_mcux_isr(void *arg)
+static void i2s_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct i2s_mcux_config *dev_cfg = dev->config;
 	I2S_Type *base = (I2S_Type *)dev_cfg->base;
 
diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
index d25ae30e824..41c18ba6efc 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -264,145 +264,145 @@ static void __stm32_exti_isr(int min, int max, const struct device *dev)
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || \
 	defined(CONFIG_SOC_SERIES_STM32L0X) || \
 	defined(CONFIG_SOC_SERIES_STM32G0X)
-static inline void __stm32_exti_isr_0_1(const void *arg)
+static inline void __stm32_exti_isr_0_1(const struct device *dev)
 {
-	__stm32_exti_isr(0, 2, arg);
+	__stm32_exti_isr(0, 2, dev);
 }
 
-static inline void __stm32_exti_isr_2_3(const void *arg)
+static inline void __stm32_exti_isr_2_3(const struct device *dev)
 {
-	__stm32_exti_isr(2, 4, arg);
+	__stm32_exti_isr(2, 4, dev);
 }
 
-static inline void __stm32_exti_isr_4_15(const void *arg)
+static inline void __stm32_exti_isr_4_15(const struct device *dev)
 {
-	__stm32_exti_isr(4, 16, arg);
+	__stm32_exti_isr(4, 16, dev);
 }
 
 #else
-static inline void __stm32_exti_isr_0(const void *arg)
+static inline void __stm32_exti_isr_0(const struct device *dev)
 {
-	__stm32_exti_isr(0, 1, arg);
+	__stm32_exti_isr(0, 1, dev);
 }
 
-static inline void __stm32_exti_isr_1(const void *arg)
+static inline void __stm32_exti_isr_1(const struct device *dev)
 {
-	__stm32_exti_isr(1, 2, arg);
+	__stm32_exti_isr(1, 2, dev);
 }
 
-static inline void __stm32_exti_isr_2(const void *arg)
+static inline void __stm32_exti_isr_2(const struct device *dev)
 {
-	__stm32_exti_isr(2, 3, arg);
+	__stm32_exti_isr(2, 3, dev);
 }
 
-static inline void __stm32_exti_isr_3(const void *arg)
+static inline void __stm32_exti_isr_3(const struct device *dev)
 {
-	__stm32_exti_isr(3, 4, arg);
+	__stm32_exti_isr(3, 4, dev);
 }
 
-static inline void __stm32_exti_isr_4(const void *arg)
+static inline void __stm32_exti_isr_4(const struct device *dev)
 {
-	__stm32_exti_isr(4, 5, arg);
+	__stm32_exti_isr(4, 5, dev);
 }
 
 #if defined(CONFIG_SOC_SERIES_STM32MP1X) || \
 	defined(CONFIG_SOC_SERIES_STM32L5X) || \
 	defined(CONFIG_SOC_SERIES_STM32U5X)
-static inline void __stm32_exti_isr_5(const void *arg)
+static inline void __stm32_exti_isr_5(const struct device *dev)
 {
-	__stm32_exti_isr(5, 6, arg);
+	__stm32_exti_isr(5, 6, dev);
 }
 
-static inline void __stm32_exti_isr_6(const void *arg)
+static inline void __stm32_exti_isr_6(const struct device *dev)
 {
-	__stm32_exti_isr(6, 7, arg);
+	__stm32_exti_isr(6, 7, dev);
 }
 
-static inline void __stm32_exti_isr_7(const void *arg)
+static inline void __stm32_exti_isr_7(const struct device *dev)
 {
-	__stm32_exti_isr(7, 8, arg);
+	__stm32_exti_isr(7, 8, dev);
 }
 
-static inline void __stm32_exti_isr_8(const void *arg)
+static inline void __stm32_exti_isr_8(const struct device *dev)
 {
-	__stm32_exti_isr(8, 9, arg);
+	__stm32_exti_isr(8, 9, dev);
 }
 
-static inline void __stm32_exti_isr_9(const void *arg)
+static inline void __stm32_exti_isr_9(const struct device *dev)
 {
-	__stm32_exti_isr(9, 10, arg);
+	__stm32_exti_isr(9, 10, dev);
 }
 
-static inline void __stm32_exti_isr_10(const void *arg)
+static inline void __stm32_exti_isr_10(const struct device *dev)
 {
-	__stm32_exti_isr(10, 11, arg);
+	__stm32_exti_isr(10, 11, dev);
 }
 
-static inline void __stm32_exti_isr_11(const void *arg)
+static inline void __stm32_exti_isr_11(const struct device *dev)
 {
-	__stm32_exti_isr(11, 12, arg);
+	__stm32_exti_isr(11, 12, dev);
 }
 
-static inline void __stm32_exti_isr_12(const void *arg)
+static inline void __stm32_exti_isr_12(const struct device *dev)
 {
-	__stm32_exti_isr(12, 13, arg);
+	__stm32_exti_isr(12, 13, dev);
 }
 
-static inline void __stm32_exti_isr_13(const void *arg)
+static inline void __stm32_exti_isr_13(const struct device *dev)
 {
-	__stm32_exti_isr(13, 14, arg);
+	__stm32_exti_isr(13, 14, dev);
 }
 
-static inline void __stm32_exti_isr_14(const void *arg)
+static inline void __stm32_exti_isr_14(const struct device *dev)
 {
-	__stm32_exti_isr(14, 15, arg);
+	__stm32_exti_isr(14, 15, dev);
 }
 
-static inline void __stm32_exti_isr_15(const void *arg)
+static inline void __stm32_exti_isr_15(const struct device *dev)
 {
-	__stm32_exti_isr(15, 16, arg);
+	__stm32_exti_isr(15, 16, dev);
 }
 #endif
 
-static inline void __stm32_exti_isr_9_5(const void *arg)
+static inline void __stm32_exti_isr_9_5(const struct device *dev)
 {
-	__stm32_exti_isr(5, 10, arg);
+	__stm32_exti_isr(5, 10, dev);
 }
 
-static inline void __stm32_exti_isr_15_10(const void *arg)
+static inline void __stm32_exti_isr_15_10(const struct device *dev)
 {
-	__stm32_exti_isr(10, 16, arg);
+	__stm32_exti_isr(10, 16, dev);
 }
 
 #if defined(CONFIG_SOC_SERIES_STM32F4X) || \
 	defined(CONFIG_SOC_SERIES_STM32F7X) || \
 	defined(CONFIG_SOC_SERIES_STM32F2X) || \
 	defined(CONFIG_SOC_SERIES_STM32MP1X)
-static inline void __stm32_exti_isr_16(const void *arg)
+static inline void __stm32_exti_isr_16(const struct device *dev)
 {
-	__stm32_exti_isr(16, 17, arg);
+	__stm32_exti_isr(16, 17, dev);
 }
 
-static inline void __stm32_exti_isr_18(const void *arg)
+static inline void __stm32_exti_isr_18(const struct device *dev)
 {
-	__stm32_exti_isr(18, 19, arg);
+	__stm32_exti_isr(18, 19, dev);
 }
 
-static inline void __stm32_exti_isr_21(const void *arg)
+static inline void __stm32_exti_isr_21(const struct device *dev)
 {
-	__stm32_exti_isr(21, 22, arg);
+	__stm32_exti_isr(21, 22, dev);
 }
 
-static inline void __stm32_exti_isr_22(const void *arg)
+static inline void __stm32_exti_isr_22(const struct device *dev)
 {
-	__stm32_exti_isr(22, 23, arg);
+	__stm32_exti_isr(22, 23, dev);
 }
 #endif
 #if defined(CONFIG_SOC_SERIES_STM32F7X) || \
 	defined(CONFIG_SOC_SERIES_STM32MP1X)
-static inline void __stm32_exti_isr_23(const void *arg)
+static inline void __stm32_exti_isr_23(const struct device *dev)
 {
-	__stm32_exti_isr(23, 24, arg);
+	__stm32_exti_isr(23, 24, dev);
 }
 #endif
 #endif /* CONFIG_SOC_SERIES_STM32F0X */
diff --git a/drivers/interrupt_controller/intc_gd32_exti.c b/drivers/interrupt_controller/intc_gd32_exti.c
index 0298fc0898d..f107ede7078 100644
--- a/drivers/interrupt_controller/intc_gd32_exti.c
+++ b/drivers/interrupt_controller/intc_gd32_exti.c
@@ -82,7 +82,7 @@ static const uint8_t line2irq[NUM_EXTI_LINES] = {
 #endif /* CONFIG_SOC_SERIES_GD32F4XX */
 };
 
-__unused static void gd32_exti_isr(void *isr_data)
+__unused static void gd32_exti_isr(const void *isr_data)
 {
 	const struct device *dev = DEVICE_DT_INST_GET(0);
 	struct gd32_exti_data *data = dev->data;
diff --git a/drivers/timer/mcux_lptmr_timer.c b/drivers/timer/mcux_lptmr_timer.c
index ade1cfd1327..e95138a22af 100644
--- a/drivers/timer/mcux_lptmr_timer.c
+++ b/drivers/timer/mcux_lptmr_timer.c
@@ -82,7 +82,7 @@ uint32_t sys_clock_cycle_get_32(void)
 	return LPTMR_GetCurrentTimerCount(LPTMR_BASE) + cycles;
 }
 
-static void mcux_lptmr_timer_isr(void *arg)
+static void mcux_lptmr_timer_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index 421499af5e3..4b79a94b0dc 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -25,7 +25,7 @@ static struct k_spinlock lock;
 static uint64_t last_count;
 static OSTIMER_Type *base;
 
-void mcux_lpc_ostick_isr(void *arg)
+void mcux_lpc_ostick_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/watchdog/wdt_mcux_imx_wdog.c b/drivers/watchdog/wdt_mcux_imx_wdog.c
index 29c84453f4d..958a93f9949 100644
--- a/drivers/watchdog/wdt_mcux_imx_wdog.c
+++ b/drivers/watchdog/wdt_mcux_imx_wdog.c
@@ -115,9 +115,8 @@ static int mcux_wdog_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
-static void mcux_wdog_isr(void *arg)
+static void mcux_wdog_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_wdog_config *config = dev->config;
 	struct mcux_wdog_data *data = dev->data;
 	WDOG_Type *base = config->base;