diff --git a/arch/arc/core/arc_smp.c b/arch/arc/core/arc_smp.c
index 80377e2fbc0..77ecf96d6ec 100644
--- a/arch/arc/core/arc_smp.c
+++ b/arch/arc/core/arc_smp.c
@@ -87,7 +87,7 @@ void z_arc_slave_start(int cpu_num)
 
 #ifdef CONFIG_SMP
 
-static void sched_ipi_handler(void *unused)
+static void sched_ipi_handler(const void *unused)
 {
 	ARG_UNUSED(unused);
 
diff --git a/arch/xtensa/core/irq_offload.c b/arch/xtensa/core/irq_offload.c
index ec01d049c93..a3d1a3cc619 100644
--- a/arch/xtensa/core/irq_offload.c
+++ b/arch/xtensa/core/irq_offload.c
@@ -17,7 +17,7 @@ static irq_offload_routine_t offload_routine;
 static const void *offload_param;
 
 /* Called by ISR dispatcher */
-void z_irq_do_offload(void *unused)
+void z_irq_do_offload(const void *unused)
 {
 	ARG_UNUSED(unused);
 	offload_routine(offload_param);
diff --git a/boards/posix/nrf52_bsim/irq_handler.c b/boards/posix/nrf52_bsim/irq_handler.c
index 904446eaac9..4f43e547afb 100644
--- a/boards/posix/nrf52_bsim/irq_handler.c
+++ b/boards/posix/nrf52_bsim/irq_handler.c
@@ -22,7 +22,7 @@
 
 static bool CPU_will_be_awaken_from_WFE;
 
-typedef void (*normal_irq_f_ptr)(void *);
+typedef void (*normal_irq_f_ptr)(const void *);
 typedef int (*direct_irq_f_ptr)(void);
 
 static struct _isr_list irq_vector_table[NRF_HW_NBR_IRQs];
diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c
index fc8fd6e7e3b..862eb58cfc1 100644
--- a/drivers/adc/adc_mcux_adc12.c
+++ b/drivers/adc/adc_mcux_adc12.c
@@ -188,9 +188,8 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static void mcux_adc12_isr(void *arg)
+static void mcux_adc12_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_adc12_config *config = dev->config;
 	struct mcux_adc12_data *data = dev->data;
 	ADC_Type *base = config->base;
diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c
index 5be4ef6ed5a..470f4c52565 100644
--- a/drivers/adc/adc_mcux_adc16.c
+++ b/drivers/adc/adc_mcux_adc16.c
@@ -203,9 +203,8 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static void mcux_adc16_isr(void *arg)
+static void mcux_adc16_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_adc16_config *config = dev->config;
 	struct mcux_adc16_data *data = dev->data;
 	ADC_Type *base = config->base;
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index b0ca9c93b0c..233ecc29fd1 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -366,10 +366,8 @@ static int adc_nrfx_read_async(const struct device *dev,
 }
 #endif /* CONFIG_ADC_ASYNC */
 
-static void saadc_irq_handler(void *param)
+static void saadc_irq_handler(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)param;
-
 	if (nrf_saadc_event_check(NRF_SAADC, NRF_SAADC_EVENT_END)) {
 		nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_END);
 
diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c
index 3e0f31c4379..61bd4282d73 100644
--- a/drivers/adc/adc_sam0.c
+++ b/drivers/adc/adc_sam0.c
@@ -429,9 +429,8 @@ static int adc_sam0_read(const struct device *dev,
 	return error;
 }
 
-static void adc_sam0_isr(void *arg)
+static void adc_sam0_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct adc_sam0_data *data = DEV_DATA(dev);
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);
 	Adc *const adc = cfg->regs;
diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
index 95a6edecd62..3a7511a88f3 100644
--- a/drivers/adc/adc_sam_afec.c
+++ b/drivers/adc/adc_sam_afec.c
@@ -325,9 +325,8 @@ static const struct adc_driver_api adc_sam_api = {
 #endif
 };
 
-static void adc_sam_isr(void *arg)
+static void adc_sam_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct adc_sam_data *data = DEV_DATA(dev);
 	const struct adc_sam_cfg *const cfg = DEV_CFG(dev);
 	Afec *const afec = cfg->regs;
diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index 36a499d1383..8a4bfb9295b 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -386,9 +386,8 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static void adc_stm32_isr(void *arg)
+static void adc_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct adc_stm32_data *data = (struct adc_stm32_data *)dev->data;
 	const struct adc_stm32_cfg *config =
 		(const struct adc_stm32_cfg *)dev->config;
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c
index a25b4fa62c2..9939d2bda44 100644
--- a/drivers/can/can_mcux_flexcan.c
+++ b/drivers/can/can_mcux_flexcan.c
@@ -611,9 +611,8 @@ static void mcux_flexcan_transfer_callback(CAN_Type *base,
 	}
 }
 
-static void mcux_flexcan_isr(void *arg)
+static void mcux_flexcan_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_flexcan_config *config = dev->config;
 	struct mcux_flexcan_data *data = dev->data;
 
diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
index a60a89763aa..a8b3943a3e9 100644
--- a/drivers/can/can_stm32.c
+++ b/drivers/can/can_stm32.c
@@ -173,14 +173,12 @@ void can_stm32_tx_isr_handler(CAN_TypeDef *can, struct can_stm32_data *data)
 
 #ifdef CONFIG_SOC_SERIES_STM32F0X
 
-static void can_stm32_isr(void *arg)
+static void can_stm32_isr(const struct device *dev)
 {
-	const struct device *dev;
 	struct can_stm32_data *data;
 	const struct can_stm32_config *cfg;
 	CAN_TypeDef *can;
 
-	dev = (const struct device *)arg;
 	data = DEV_DATA(dev);
 	cfg = DEV_CFG(dev);
 	can = cfg->can;
@@ -195,14 +193,12 @@ static void can_stm32_isr(void *arg)
 
 #else
 
-static void can_stm32_rx_isr(void *arg)
+static void can_stm32_rx_isr(const struct device *dev)
 {
-	const struct device *dev;
 	struct can_stm32_data *data;
 	const struct can_stm32_config *cfg;
 	CAN_TypeDef *can;
 
-	dev = (const struct device *)arg;
 	data = DEV_DATA(dev);
 	cfg = DEV_CFG(dev);
 	can = cfg->can;
@@ -210,14 +206,12 @@ static void can_stm32_rx_isr(void *arg)
 	can_stm32_rx_isr_handler(can, data);
 }
 
-static void can_stm32_tx_isr(void *arg)
+static void can_stm32_tx_isr(const struct device *dev)
 {
-	const struct device *dev;
 	struct can_stm32_data *data;
 	const struct can_stm32_config *cfg;
 	CAN_TypeDef *can;
 
-	dev = (const struct device *)arg;
 	data = DEV_DATA(dev);
 	cfg = DEV_CFG(dev);
 	can = cfg->can;
@@ -225,14 +219,12 @@ static void can_stm32_tx_isr(void *arg)
 	can_stm32_tx_isr_handler(can, data);
 }
 
-static void can_stm32_state_change_isr(void *arg)
+static void can_stm32_state_change_isr(const struct device *dev)
 {
-	const struct device *dev;
 	struct can_stm32_data *data;
 	const struct can_stm32_config *cfg;
 	CAN_TypeDef *can;
 
-	dev = (const struct device *)arg;
 	data = DEV_DATA(dev);
 	cfg = DEV_CFG(dev);
 	can = cfg->can;
diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c
index b2bfc2b9e44..c1ec783daab 100644
--- a/drivers/counter/counter_imx_epit.c
+++ b/drivers/counter/counter_imx_epit.c
@@ -29,9 +29,8 @@ static inline const struct imx_epit_config *get_epit_config(const struct device
 			    info);
 }
 
-static void imx_epit_isr(void *arg)
+static void imx_epit_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	EPIT_Type *base = get_epit_config(dev)->base;
 	struct imx_epit_data *driver_data = dev->data;
 
diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
index 97c55ea3d3c..69d798e660f 100644
--- a/drivers/counter/counter_ll_stm32_rtc.c
+++ b/drivers/counter/counter_ll_stm32_rtc.c
@@ -245,9 +245,8 @@ static uint32_t rtc_stm32_get_max_relative_alarm(const struct device *dev)
 }
 
 
-void rtc_stm32_isr(void *arg)
+void rtc_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct rtc_stm32_data *data = DEV_DATA(dev);
 	counter_alarm_callback_t alarm_callback = data->callback;
 
diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c
index efb9ff3739d..56a8a0886da 100644
--- a/drivers/counter/counter_mcux_gpt.c
+++ b/drivers/counter/counter_mcux_gpt.c
@@ -100,9 +100,8 @@ static int mcux_gpt_cancel_alarm(const struct device *dev, uint8_t chan_id)
 	return 0;
 }
 
-void mcux_gpt_isr(void *p)
+void mcux_gpt_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	const struct mcux_gpt_config *config = dev->config;
 	struct mcux_gpt_data *data = dev->data;
 	uint32_t current = GPT_GetCurrentTimerCount(config->base);
diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c
index 0c7ca5db7d1..dc5a6c43c04 100644
--- a/drivers/counter/counter_mcux_lptmr.c
+++ b/drivers/counter/counter_mcux_lptmr.c
@@ -111,9 +111,8 @@ static uint32_t mcux_lptmr_get_max_relative_alarm(const struct device *dev)
 	return 0;
 }
 
-static void mcux_lptmr_isr(void *arg)
+static void mcux_lptmr_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct mcux_lptmr_config *config = dev->config;
 	struct mcux_lptmr_data *data = dev->data;
 	uint32_t flags;
diff --git a/drivers/counter/counter_mcux_pit.c b/drivers/counter/counter_mcux_pit.c
index 9d002ff3a26..1a73d20ac6f 100644
--- a/drivers/counter/counter_mcux_pit.c
+++ b/drivers/counter/counter_mcux_pit.c
@@ -114,9 +114,8 @@ static uint32_t mcux_pit_get_max_relative_alarm(const struct device *dev)
 	return config->info.max_top_value;
 }
 
-static void mcux_pit_isr(void *arg)
+static void mcux_pit_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct mcux_pit_config *config = dev->config;
 	struct mcux_pit_data *data = dev->data;
 	uint32_t flags;
diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c
index f6b035b0d2e..c3fe4dcc68c 100644
--- a/drivers/counter/counter_mcux_rtc.c
+++ b/drivers/counter/counter_mcux_rtc.c
@@ -189,9 +189,8 @@ static uint32_t mcux_rtc_get_max_relative_alarm(const struct device *dev)
 	return info->max_top_value;
 }
 
-static void mcux_rtc_isr(void *arg)
+static void mcux_rtc_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct counter_config_info *info = dev->config;
 	const struct mcux_rtc_config *config =
 		CONTAINER_OF(info, struct mcux_rtc_config, info);
diff --git a/drivers/counter/counter_native_posix.c b/drivers/counter/counter_native_posix.c
index 9b28b984983..72a2873918e 100644
--- a/drivers/counter/counter_native_posix.c
+++ b/drivers/counter/counter_native_posix.c
@@ -22,7 +22,7 @@ static struct counter_alarm_cfg pending_alarm;
 static bool is_alarm_pending;
 static const struct device *device;
 
-static void counter_isr(void *arg)
+static void counter_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	uint32_t current_value = hw_counter_get_value();
diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c
index 6e101a73fe3..7109b0766de 100644
--- a/drivers/counter/counter_sam0_tc32.c
+++ b/drivers/counter/counter_sam0_tc32.c
@@ -310,9 +310,8 @@ static uint32_t counter_sam0_tc32_get_max_relative_alarm(const struct device *de
 	return counter_sam0_tc32_get_top_value(dev) - 1;
 }
 
-static void counter_sam0_tc32_isr(void *arg)
+static void counter_sam0_tc32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct counter_sam0_tc32_data *data = DEV_DATA(dev);
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c
index 45e70aef550..153f39c1e6f 100644
--- a/drivers/counter/timer_dtmr_cmsdk_apb.c
+++ b/drivers/counter/timer_dtmr_cmsdk_apb.c
@@ -127,9 +127,8 @@ static const struct counter_driver_api dtmr_cmsdk_apb_api = {
 	.get_top_value = dtmr_cmsdk_apb_get_top_value,
 };
 
-static void dtmr_cmsdk_apb_isr(void *arg)
+static void dtmr_cmsdk_apb_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct dtmr_cmsdk_apb_dev_data *data = dev->data;
 	const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config;
 
diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c
index 93eb33fa7b3..d86ce939fa6 100644
--- a/drivers/display/display_mcux_elcdif.c
+++ b/drivers/display/display_mcux_elcdif.c
@@ -164,9 +164,8 @@ static void mcux_elcdif_get_capabilities(const struct device *dev,
 	capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL;
 }
 
-static void mcux_elcdif_isr(void *arg)
+static void mcux_elcdif_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_elcdif_config *config = dev->config;
 	struct mcux_elcdif_data *data = dev->data;
 	uint32_t status;
diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c
index 9ceec285424..42f15bc1346 100644
--- a/drivers/dma/dma_dw.c
+++ b/drivers/dma/dma_dw.c
@@ -53,9 +53,8 @@ static ALWAYS_INLINE uint32_t dw_read(uint32_t dma_base, uint32_t reg)
 	return *((volatile uint32_t*)(dma_base + reg));
 }
 
-static void dw_dma_isr(void *arg)
+static void dw_dma_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct dw_dma_dev_data *const dev_data = DEV_DATA(dev);
 	struct dma_chan_data *chan_data;
diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c
index 1da8bb252de..960e24351cb 100644
--- a/drivers/dma/dma_mcux_edma.c
+++ b/drivers/dma/dma_mcux_edma.c
@@ -135,9 +135,8 @@ static void channel_irq(edma_handle_t *handle)
 	}
 }
 
-static void dma_mcux_edma_irq_handler(void *arg)
+static void dma_mcux_edma_irq_handler(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	int i = 0;
 
 	LOG_DBG("IRQ CALLED");
@@ -165,11 +164,10 @@ static void dma_mcux_edma_irq_handler(void *arg)
 	}
 }
 
-static void dma_mcux_edma_error_irq_handler(void *arg)
+static void dma_mcux_edma_error_irq_handler(const struct device *dev)
 {
 	int i = 0;
 	uint32_t flag = 0;
-	const struct device *dev = (const struct device *)arg;
 
 	for (i = 0; i < DT_INST_PROP(0, dma_channels); i++) {
 		if (DEV_CHANNEL_DATA(dev, i)->busy) {
diff --git a/drivers/dma/dma_mcux_lpc.c b/drivers/dma/dma_mcux_lpc.c
index e8378f86058..13bc605e040 100644
--- a/drivers/dma/dma_mcux_lpc.c
+++ b/drivers/dma/dma_mcux_lpc.c
@@ -73,10 +73,8 @@ static void nxp_lpc_dma_callback(dma_handle_t *handle, void *param,
 }
 
 /* Handles DMA interrupts and dispatches to the individual channel */
-static void dma_mcux_lpc_irq_handler(void *arg)
+static void dma_mcux_lpc_irq_handler(const struct device *dev)
 {
-	const struct device *dev = arg;
-
 	DMA_IRQHandle(DEV_BASE(dev));
 /*
  * Add for ARM errata 838869, affects Cortex-M4, Cortex-M4F Store
diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c
index b0504481dc8..65b7f73ed72 100644
--- a/drivers/dma/dma_sam0.c
+++ b/drivers/dma/dma_sam0.c
@@ -31,9 +31,8 @@ struct dma_sam0_data {
 
 
 /* Handles DMA interrupts and dispatches to the individual channel */
-static void dma_sam0_isr(void *arg)
+static void dma_sam0_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct dma_sam0_data *data = DEV_DATA(dev);
 	struct dma_sam0_channel *chdata;
 	uint16_t pend = DMA_REGS->INTPEND.reg;
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index 1d140decdc8..e2f2da50bf5 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -51,9 +51,8 @@ struct sam_xdmac_dev_data {
 #define DEV_DATA(dev) \
 	((struct sam_xdmac_dev_data *const)(dev)->data)
 
-static void sam_xdmac_isr(void *arg)
+static void sam_xdmac_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct sam_xdmac_dev_data *const dev_data = DEV_DATA(dev);
 	Xdmac *const xdmac = dev_cfg->regs;
diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c
index 736d4a13ff8..73b5a8a8baf 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -136,7 +136,7 @@ static int entropy_cc13xx_cc26xx_get_entropy(const struct device *dev,
 	return 0;
 }
 
-static void entropy_cc13xx_cc26xx_isr(void *arg)
+static void entropy_cc13xx_cc26xx_isr(const void *arg)
 {
 	struct entropy_cc13xx_cc26xx_data *data = get_dev_data(arg);
 	uint32_t src = 0;
diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c
index 6798af07f0a..0700f4c6efb 100644
--- a/drivers/entropy/entropy_nrf5.c
+++ b/drivers/entropy/entropy_nrf5.c
@@ -204,7 +204,7 @@ static void rng_pool_init(struct rng_pool *rngp, uint16_t size, uint8_t threshol
 	rngp->threshold	  = threshold;
 }
 
-static void isr(void *arg)
+static void isr(const void *arg)
 {
 	int byte, ret;
 
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index 8665b61c18c..2a09d4cfa5c 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/drivers/entropy/entropy_stm32.c
@@ -216,7 +216,7 @@ static void rng_pool_init(struct rng_pool *rngp, uint16_t size,
 	rngp->threshold	  = threshold;
 }
 
-static void stm32_rng_isr(void *arg)
+static void stm32_rng_isr(const void *arg)
 {
 	int byte, ret;
 
diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c
index 3086e585862..06bf27a0ea6 100644
--- a/drivers/espi/espi_mchp_xec.c
+++ b/drivers/espi/espi_mchp_xec.c
@@ -1204,9 +1204,8 @@ static uint8_t m2s_vwires_isr_cnt =
 	sizeof(m2s_vwires_isr) / sizeof(struct espi_isr);
 static uint8_t periph_isr_cnt = sizeof(peripherals_isr) / sizeof(struct espi_isr);
 
-static void espi_xec_bus_isr(void *arg)
+static void espi_xec_bus_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct espi_xec_config *config = dev->config;
 	uint32_t girq_result;
 
@@ -1225,9 +1224,8 @@ static void espi_xec_bus_isr(void *arg)
 	REG32(MCHP_GIRQ_SRC_ADDR(config->bus_girq_id)) = girq_result;
 }
 
-static void espi_xec_vw_isr(void *arg)
+static void espi_xec_vw_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct espi_xec_config *config = dev->config;
 	uint32_t girq_result;
 
@@ -1246,9 +1244,8 @@ static void espi_xec_vw_isr(void *arg)
 	REG32(MCHP_GIRQ_SRC_ADDR(config->vw_girq_id)) = girq_result;
 }
 
-static void espi_xec_periph_isr(void *arg)
+static void espi_xec_periph_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct espi_xec_config *config = dev->config;
 	uint32_t girq_result;
 
diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c
index d864a65a7dd..4c680d65a3c 100644
--- a/drivers/ethernet/eth_gecko.c
+++ b/drivers/ethernet/eth_gecko.c
@@ -367,9 +367,8 @@ static void rx_thread(void *arg1, void *unused1, void *unused2)
 	}
 }
 
-static void eth_isr(void *arg)
+static void eth_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev);
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
@@ -381,7 +380,6 @@ static void eth_isr(void *arg)
 				ETH_IENS_AMBAERR);
 	uint32_t rx_irq_mask = (ETH_IENS_RXCMPLT | ETH_IENS_RXUSEDBITREAD);
 
-	__ASSERT_NO_MSG(arg != NULL);
 	__ASSERT_NO_MSG(dev_data != NULL);
 	__ASSERT_NO_MSG(cfg != NULL);
 
diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
index 3d9d74faafc..6aac3b2378e 100644
--- a/drivers/ethernet/eth_mcux.c
+++ b/drivers/ethernet/eth_mcux.c
@@ -1214,9 +1214,8 @@ static const struct ethernet_api api_funcs = {
 };
 
 #if defined(CONFIG_PTP_CLOCK_MCUX)
-static void eth_mcux_ptp_isr(void *p)
+static void eth_mcux_ptp_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	struct eth_context *context = dev->data;
 
 	ENET_Ptp1588TimerIRQHandler(context->base, &context->enet_handle);
@@ -1224,9 +1223,8 @@ static void eth_mcux_ptp_isr(void *p)
 #endif
 
 #if DT_INST_IRQ_HAS_NAME(0, common)
-static void eth_mcux_dispacher_isr(void *p)
+static void eth_mcux_dispacher_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	struct eth_context *context = dev->data;
 	uint32_t EIR = ENET_GetInterruptStatus(context->base);
 	int irq_lock_key = irq_lock();
@@ -1247,9 +1245,8 @@ static void eth_mcux_dispacher_isr(void *p)
 #endif
 
 #if DT_INST_IRQ_HAS_NAME(0, rx)
-static void eth_mcux_rx_isr(void *p)
+static void eth_mcux_rx_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	struct eth_context *context = dev->data;
 
 	ENET_ReceiveIRQHandler(context->base, &context->enet_handle);
@@ -1257,9 +1254,8 @@ static void eth_mcux_rx_isr(void *p)
 #endif
 
 #if DT_INST_IRQ_HAS_NAME(0, tx)
-static void eth_mcux_tx_isr(void *p)
+static void eth_mcux_tx_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	struct eth_context *context = dev->data;
 
 	ENET_TransmitIRQHandler(context->base, &context->enet_handle);
@@ -1267,9 +1263,8 @@ static void eth_mcux_tx_isr(void *p)
 #endif
 
 #if DT_INST_IRQ_HAS_NAME(0, err_misc)
-static void eth_mcux_error_isr(void *p)
+static void eth_mcux_error_isr(const struct device *dev)
 {
-	const struct device *dev = p;
 	struct eth_context *context = dev->data;
 	uint32_t pending = ENET_GetInterruptStatus(context->base);
 
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
index 22ea8e6c34f..481dd9bb700 100644
--- a/drivers/ethernet/eth_sam_gmac.c
+++ b/drivers/ethernet/eth_sam_gmac.c
@@ -1624,9 +1624,8 @@ static int eth_tx(const struct device *dev, struct net_pkt *pkt)
 	return 0;
 }
 
-static void queue0_isr(void *arg)
+static void queue0_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev);
 	struct eth_sam_dev_data *const dev_data = DEV_DATA(dev);
 	Gmac *gmac = cfg->regs;
@@ -1726,35 +1725,35 @@ static inline void priority_queue_isr(void *arg, unsigned int queue_idx)
 #endif
 
 #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 1
-static void queue1_isr(void *arg)
+static void queue1_isr(const void *arg)
 {
 	priority_queue_isr(arg, 1);
 }
 #endif
 
 #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 2
-static void queue2_isr(void *arg)
+static void queue2_isr(const void *arg)
 {
 	priority_queue_isr(arg, 2);
 }
 #endif
 
 #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 3
-static void queue3_isr(void *arg)
+static void queue3_isr(const void *arg)
 {
 	priority_queue_isr(arg, 3);
 }
 #endif
 
 #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 4
-static void queue4_isr(void *arg)
+static void queue4_isr(const void *arg)
 {
 	priority_queue_isr(arg, 4);
 }
 #endif
 
 #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 5
-static void queue5_isr(void *arg)
+static void queue5_isr(const void *arg)
 {
 	priority_queue_isr(arg, 5);
 }
diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c
index 40a63e7cd09..0bee952cb71 100644
--- a/drivers/ethernet/eth_stellaris.c
+++ b/drivers/ethernet/eth_stellaris.c
@@ -227,10 +227,8 @@ err_mem:
 	eth_stellaris_rx_error(iface);
 }
 
-static void eth_stellaris_isr(void *arg)
+static void eth_stellaris_isr(const struct device *dev)
 {
-	/* Read the interrupt status */
-	const struct device *dev = (const struct device *)arg;
 	struct eth_stellaris_runtime *dev_data = DEV_DATA(dev);
 	int isr_val = sys_read32(REG_MACRIS);
 	uint32_t lock;
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index f49ff5ed251..c057d8c461a 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -465,15 +465,13 @@ static void rx_thread(void *arg1, void *unused1, void *unused2)
 	}
 }
 
-static void eth_isr(void *arg)
+static void eth_isr(const struct device *dev)
 {
-	const struct device *dev;
 	struct eth_stm32_hal_dev_data *dev_data;
 	ETH_HandleTypeDef *heth;
 
-	__ASSERT_NO_MSG(arg != NULL);
+	__ASSERT_NO_MSG(dev != NULL);
 
-	dev = (const struct device *)arg;
 	dev_data = DEV_DATA(dev);
 
 	__ASSERT_NO_MSG(dev_data != NULL);
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
index d2fc6984c28..ebd90e78f0e 100644
--- a/drivers/gpio/gpio_cc13xx_cc26xx.c
+++ b/drivers/gpio/gpio_cc13xx_cc26xx.c
@@ -198,9 +198,8 @@ static uint32_t gpio_cc13xx_cc26xx_get_pending_int(const struct device *dev)
 
 DEVICE_DECLARE(gpio_cc13xx_cc26xx);
 
-static void gpio_cc13xx_cc26xx_isr(void *arg)
+static void gpio_cc13xx_cc26xx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct gpio_cc13xx_cc26xx_data *data = dev->data;
 
 	uint32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
index d8bc74f1249..2f9599fb78d 100644
--- a/drivers/gpio/gpio_cc32xx.c
+++ b/drivers/gpio/gpio_cc32xx.c
@@ -217,9 +217,8 @@ static int gpio_cc32xx_manage_callback(const struct device *dev,
 	return gpio_manage_callback(&data->callbacks, callback, set);
 }
 
-static void gpio_cc32xx_port_isr(void *arg)
+static void gpio_cc32xx_port_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct gpio_cc32xx_config *config = DEV_CFG(dev);
 	struct gpio_cc32xx_data *data = DEV_DATA(dev);
 	uint32_t int_status;
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index 71582dbe3b3..8938057c84d 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -191,9 +191,8 @@ static int gpio_cmsdk_ahb_pin_interrupt_configure(const struct device *dev,
 	return 0;
 }
 
-static void gpio_cmsdk_ahb_isr(void *arg)
+static void gpio_cmsdk_ahb_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config;
 	struct gpio_cmsdk_ahb_dev_data *data = dev->data;
 	uint32_t int_stat;
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 925cc374c91..7e315303d4f 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -487,9 +487,8 @@ static int gpio_dw_device_ctrl(const struct device *port,
 
 #define gpio_dw_unmask_int(...)
 
-static void gpio_dw_isr(void *arg)
+static void gpio_dw_isr(const struct device *port)
 {
-	const struct device *port = (const struct device *)arg;
 	struct gpio_dw_runtime *context = port->data;
 	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
 	uint32_t int_status;
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index 65c7c2d44d2..9cdfa7f471a 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -263,7 +263,7 @@ static void gpio_esp32_fire_callbacks(const struct device *device)
 	gpio_fire_callbacks(&data->cb, device, irq_status);
 }
 
-static void gpio_esp32_isr(void *param);
+static void gpio_esp32_isr(const void *param);
 
 static int gpio_esp32_init(const struct device *device)
 {
@@ -355,7 +355,7 @@ GPIO_DEVICE_INIT(0);
 GPIO_DEVICE_INIT(1);
 #endif
 
-static void gpio_esp32_isr(void *param)
+static void gpio_esp32_isr(const void *param)
 {
 
 #if defined(CONFIG_GPIO_ESP32_0)
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index 7ee86f5244a..aad5cf8d3aa 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -234,9 +234,8 @@ static int gpio_gecko_manage_callback(const struct device *dev,
 /**
  * Handler for both odd and even pin interrupts
  */
-static void gpio_gecko_common_isr(void *arg)
+static void gpio_gecko_common_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct gpio_gecko_common_data *data = dev->data;
 	uint32_t enabled_int, int_status;
 	const struct device *port_dev;
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index 6c3ecf727cf..35e049b773b 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -183,9 +183,8 @@ static int imx_gpio_manage_callback(const struct device *port,
 	return gpio_manage_callback(&data->callbacks, cb, set);
 }
 
-static void imx_gpio_port_isr(void *arg)
+static void imx_gpio_port_isr(const struct device *port)
 {
-	const struct device *port = (const struct device *)arg;
 	const struct imx_gpio_config *config = port->config;
 	struct imx_gpio_data *data = port->data;
 	uint32_t int_status;
diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c
index a295c8863a8..dde02bd9906 100644
--- a/drivers/gpio/gpio_intel_apl.c
+++ b/drivers/gpio/gpio_intel_apl.c
@@ -184,9 +184,8 @@ static int nr_isr_devs;
 
 static const struct device *isr_devs[GPIO_INTEL_APL_NR_SUBDEVS];
 
-static void gpio_intel_apl_isr(void *arg)
+static void gpio_intel_apl_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_intel_apl_config *cfg;
 	struct gpio_intel_apl_data *data;
 	struct gpio_callback *cb, *tmp;
diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c
index 3b6f2e289a9..0e47559959e 100644
--- a/drivers/gpio/gpio_lpc11u6x.c
+++ b/drivers/gpio/gpio_lpc11u6x.c
@@ -428,9 +428,10 @@ DEVICE_DECLARE(gpio_lpc11u6x_1);
 DEVICE_DECLARE(gpio_lpc11u6x_2);
 #endif
 
-static void gpio_lpc11u6x_isr(void *arg)
+static void gpio_lpc11u6x_isr(const void *arg)
 {
-	struct gpio_lpc11u6x_shared *shared = arg;
+	struct gpio_lpc11u6x_shared *shared =
+		(struct gpio_lpc11u6x_shared *)arg;
 	struct lpc11u6x_pint_regs *pint_regs = (struct lpc11u6x_pint_regs *)
 		(shared->gpio_base + LPC11U6X_PINT_REGS);
 	uint32_t *pintsel_reg =
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index 14907a015bf..2c124c6f331 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -277,9 +277,8 @@ static int gpio_xec_manage_callback(const struct device *dev,
 	return 0;
 }
 
-static void gpio_gpio_xec_port_isr(void *arg)
+static void gpio_gpio_xec_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_xec_config *config = dev->config;
 	struct gpio_xec_data *data = dev->data;
 	uint32_t girq_result;
diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c
index 5d782ef35bd..540777f1341 100644
--- a/drivers/gpio/gpio_mcux.c
+++ b/drivers/gpio/gpio_mcux.c
@@ -226,9 +226,8 @@ static int gpio_mcux_manage_callback(const struct device *dev,
 	return gpio_manage_callback(&data->callbacks, callback, set);
 }
 
-static void gpio_mcux_port_isr(void *arg)
+static void gpio_mcux_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_mcux_config *config = dev->config;
 	struct gpio_mcux_data *data = dev->data;
 	uint32_t int_status;
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index 7af470727aa..13088b4de75 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -177,9 +177,8 @@ static int mcux_igpio_manage_callback(const struct device *dev,
 	return gpio_manage_callback(&data->callbacks, callback, set);
 }
 
-static void mcux_igpio_port_isr(void *arg)
+static void mcux_igpio_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_igpio_config *config = dev->config;
 	struct mcux_igpio_data *data = dev->data;
 	GPIO_Type *base = config->base;
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 65d0a295d85..57903f67043 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -183,9 +183,8 @@ static int gpio_mcux_lpc_port_toggle_bits(const struct device *dev,
 	return 0;
 }
 
-static void gpio_mcux_lpc_port_isr(void *arg)
+static void gpio_mcux_lpc_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_mcux_lpc_config *config = dev->config;
 	struct gpio_mcux_lpc_data *data = dev->data;
 	uint32_t enabled_int;
@@ -251,7 +250,7 @@ static uint32_t attach_pin_to_isr(uint32_t port, uint32_t pin, uint32_t isr_no)
 	return pint_idx;
 }
 
-static void gpio_mcux_lpc_port_isr(void *arg);
+static void gpio_mcux_lpc_port_isr(const struct device *dev);
 
 
 static int gpio_mcux_lpc_pin_interrupt_configure(const struct device *dev,
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
index 2eb5bb61697..53f379e1a9d 100644
--- a/drivers/gpio/gpio_rv32m1.c
+++ b/drivers/gpio/gpio_rv32m1.c
@@ -246,9 +246,8 @@ static int gpio_rv32m1_manage_callback(const struct device *dev,
 	return 0;
 }
 
-static void gpio_rv32m1_port_isr(void *arg)
+static void gpio_rv32m1_port_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_rv32m1_config *config = dev->config;
 	struct gpio_rv32m1_data *data = dev->data;
 	uint32_t int_status;
diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c
index eee71ea185a..b603fe07ac9 100644
--- a/drivers/gpio/gpio_sam.c
+++ b/drivers/gpio/gpio_sam.c
@@ -264,9 +264,8 @@ static int gpio_sam_pin_interrupt_configure(const struct device *dev,
 	return gpio_sam_port_interrupt_configure(dev, BIT(pin), mode, trig);
 }
 
-static void gpio_sam_isr(void *arg)
+static void gpio_sam_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
 	struct gpio_sam_runtime *context = dev->data;
diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c
index 741d2a97e79..7f6fd334d50 100644
--- a/drivers/gpio/gpio_sifive.c
+++ b/drivers/gpio/gpio_sifive.c
@@ -112,9 +112,8 @@ static inline int gpio_sifive_plic_to_pin(unsigned int base_irq, int plic_irq)
 	return (plic_irq - base_irq);
 }
 
-static void gpio_sifive_irq_handler(void *arg)
+static void gpio_sifive_irq_handler(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct gpio_sifive_data *data = DEV_GPIO_DATA(dev);
 	volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev);
 	const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev);
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index 2afca28120a..0d21bbbb107 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -57,9 +57,8 @@ enum gpio_regs {
 	GPIO_ICR_OFFSET = 0x41C,
 };
 
-static void gpio_stellaris_isr(void *arg)
+static void gpio_stellaris_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
 	struct gpio_stellaris_runtime *context = DEV_DATA(dev);
 	uint32_t base = cfg->base;
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index 66d2f032233..b24c54ab195 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -284,7 +284,7 @@ static int i2c_cc13xx_cc26xx_configure(const struct device *dev,
 	return 0;
 }
 
-static void i2c_cc13xx_cc26xx_isr(void *arg)
+static void i2c_cc13xx_cc26xx_isr(const void *arg)
 {
 	const uint32_t base = get_dev_config(arg)->base;
 	struct i2c_cc13xx_cc26xx_data *data = get_dev_data(arg);
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index e1872235e6e..b41d97862dc 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -261,9 +261,8 @@ static void i2c_cc32xx_isr_handle_read(uint32_t base,
 	}
 }
 
-static void i2c_cc32xx_isr(void *arg)
+static void i2c_cc32xx_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	uint32_t base = DEV_BASE(dev);
 	struct i2c_cc32xx_data *data = DEV_DATA(dev);
 	uint32_t err_status;
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index 67cf2b46876..964f83a023e 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -549,13 +549,12 @@ static int i2c_esp32_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return ret;
 }
 
-static void i2c_esp32_isr(void *arg)
+static void i2c_esp32_isr(const struct device *device)
 {
 	const int fifo_give_mask = I2C_ACK_ERR_INT_ST |
 				   I2C_TIME_OUT_INT_ST |
 				   I2C_TRANS_COMPLETE_INT_ST |
 				   I2C_ARBITRATION_LOST_INT_ST;
-	const struct device *device = arg;
 	const struct i2c_esp32_config *config = device->config;
 
 	if (sys_read32(I2C_INT_STATUS_REG(config->index)) & fifo_give_mask) {
diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c
index b64d695dc5e..9f016667af4 100644
--- a/drivers/i2c/i2c_imx.c
+++ b/drivers/i2c/i2c_imx.c
@@ -269,9 +269,8 @@ finish:
 }
 
 
-static void i2c_imx_isr(void *arg)
+static void i2c_imx_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
 	struct i2c_master_transfer *transfer = &data->transfer;
diff --git a/drivers/i2c/i2c_lpc11u6x.c b/drivers/i2c/i2c_lpc11u6x.c
index 7f7fedd8947..63fa1564b64 100644
--- a/drivers/i2c/i2c_lpc11u6x.c
+++ b/drivers/i2c/i2c_lpc11u6x.c
@@ -192,7 +192,7 @@ static int lpc11u6x_i2c_slave_unregister(const struct device *dev,
 	return 0;
 }
 
-static void lpc11u6x_i2c_isr(void *arg)
+static void lpc11u6x_i2c_isr(const void *arg)
 {
 	struct lpc11u6x_i2c_data *data = DEV_DATA((const struct device *)arg);
 	struct lpc11u6x_i2c_regs *i2c = DEV_BASE((const struct device *) arg);
diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c
index 7e01805e1f4..305a9ce87d6 100644
--- a/drivers/i2c/i2c_mcux.c
+++ b/drivers/i2c/i2c_mcux.c
@@ -163,9 +163,8 @@ static int i2c_mcux_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return 0;
 }
 
-static void i2c_mcux_isr(void *arg)
+static void i2c_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_mcux_data *data = DEV_DATA(dev);
 
diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c
index a48af179e44..b3b59f1a94f 100644
--- a/drivers/i2c/i2c_mcux_flexcomm.c
+++ b/drivers/i2c/i2c_mcux_flexcomm.c
@@ -159,9 +159,8 @@ static int mcux_flexcomm_transfer(const struct device *dev,
 	return 0;
 }
 
-static void mcux_flexcomm_isr(void *arg)
+static void mcux_flexcomm_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_flexcomm_config *config = dev->config;
 	struct mcux_flexcomm_data *data = dev->data;
 	I2C_Type *base = config->base;
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
index d118a053c81..a6ac5aa0cbb 100644
--- a/drivers/i2c/i2c_mcux_lpi2c.c
+++ b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -169,9 +169,8 @@ static int mcux_lpi2c_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return 0;
 }
 
-static void mcux_lpi2c_isr(void *arg)
+static void mcux_lpi2c_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_lpi2c_config *config = dev->config;
 	struct mcux_lpi2c_data *data = dev->data;
 	LPI2C_Type *base = config->base;
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 92dd0c4488c..d575c58cd0e 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -141,9 +141,8 @@ i2c_transfer_err:
 	return rc;
 }
 
-static void i2c_nios2_isr(void *arg)
+static void i2c_nios2_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct i2c_nios2_config *config = DEV_CFG(dev);
 
 	/* Call Altera HAL driver ISR */
diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
index 4af4492d1fd..a91d7e258e5 100644
--- a/drivers/i2c/i2c_rv32m1_lpi2c.c
+++ b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -200,9 +200,8 @@ out:
 	return ret;
 }
 
-static void rv32m1_lpi2c_isr(void *arg)
+static void rv32m1_lpi2c_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct rv32m1_lpi2c_config *config = dev->config;
 	struct rv32m1_lpi2c_data *data = dev->data;
 
diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c
index 24d78fc149d..28878447e8e 100644
--- a/drivers/i2c/i2c_sam0.c
+++ b/drivers/i2c/i2c_sam0.c
@@ -126,9 +126,8 @@ static bool i2c_sam0_terminate_on_error(const struct device *dev)
 	return true;
 }
 
-static void i2c_sam0_isr(void *arg)
+static void i2c_sam0_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct i2c_sam0_dev_data *data = DEV_DATA(dev);
 	const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev);
 	SercomI2cm *i2c = cfg->regs;
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index 453bafba170..76177f7e9c6 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -235,9 +235,8 @@ static int i2c_sam_twi_transfer(const struct device *dev,
 	return 0;
 }
 
-static void i2c_sam_twi_isr(void *arg)
+static void i2c_sam_twi_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev);
 	Twi *const twi = dev_cfg->regs;
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index b197c7f3dc6..261544b6b5f 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -222,9 +222,8 @@ static int i2c_sam_twihs_transfer(const struct device *dev,
 	return 0;
 }
 
-static void i2c_sam_twihs_isr(void *arg)
+static void i2c_sam_twihs_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev);
 	Twihs *const twihs = dev_cfg->regs;
diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c
index d91d840595d..8c2c13f516c 100644
--- a/drivers/i2s/i2s_cavs.c
+++ b/drivers/i2s/i2s_cavs.c
@@ -819,9 +819,8 @@ static int i2s_cavs_write(const struct device *dev, void *mem_block,
 }
 
 /* clear IRQ sources atm */
-static void i2s_cavs_isr(void *arg)
+static void i2s_cavs_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev);
 	volatile struct i2s_cavs_ssp *const ssp = dev_cfg->regs;
 	struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev);
diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c
index d15dde42529..3cae4a7847e 100644
--- a/drivers/i2s/i2s_ll_stm32.c
+++ b/drivers/i2s/i2s_ll_stm32.c
@@ -631,9 +631,8 @@ tx_disable:
 static uint32_t i2s_stm32_irq_count;
 static uint32_t i2s_stm32_irq_ovr_count;
 
-static void i2s_stm32_isr(void *arg)
+static void i2s_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *) arg;
 	const struct i2s_stm32_cfg *cfg = DEV_CFG(dev);
 	struct i2s_stm32_data *const dev_data = DEV_DATA(dev);
 	struct stream *stream = &dev_data->rx;
diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c
index 25c933f5008..4221f4a081b 100644
--- a/drivers/i2s/i2s_sam_ssc.c
+++ b/drivers/i2s/i2s_sam_ssc.c
@@ -889,9 +889,8 @@ static int i2s_sam_write(const struct device *dev, void *mem_block,
 	return 0;
 }
 
-static void i2s_sam_isr(void *arg)
+static void i2s_sam_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev);
 	Ssc *const ssc = dev_cfg->regs;
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
index 5b28a60e699..bbb63086671 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
@@ -381,7 +381,7 @@ static void ieee802154_cc13xx_cc26xx_cpe0_isr(void *arg)
 	}
 }
 
-static void ieee802154_cc13xx_cc26xx_cpe1_isr(void *arg)
+static void ieee802154_cc13xx_cc26xx_cpe1_isr(const void *arg)
 {
 	uint32_t flags;
 
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index 90f6f1c8e07..ac990819664 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -48,9 +48,8 @@ static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(uint32_t intr_status,
 	}
 }
 
-static void cavs_ictl_isr(void *arg)
+static void cavs_ictl_isr(const struct device *port)
 {
-	const struct device *port = (const struct device *)arg;
 	struct cavs_ictl_runtime *context = port->data;
 
 	const struct cavs_ictl_config *config = port->config;
diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c
index d41c7763671..bd6d22fc158 100644
--- a/drivers/interrupt_controller/intc_dw.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -46,9 +46,8 @@ static int dw_ictl_initialize(const struct device *dev)
 	return 0;
 }
 
-static void dw_ictl_isr(void *arg)
+static void dw_ictl_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct dw_ictl_config *config = dev->config;
 	volatile struct dw_ictl_registers * const regs =
 			(struct dw_ictl_registers *)config->base_addr;
diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
index 9a94453f55c..4393040e9f6 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -248,111 +248,111 @@ static void __stm32_exti_isr(int min, int max, void *arg)
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || \
 	defined(CONFIG_SOC_SERIES_STM32L0X) || \
 	defined(CONFIG_SOC_SERIES_STM32G0X)
-static inline void __stm32_exti_isr_0_1(void *arg)
+static inline void __stm32_exti_isr_0_1(const void *arg)
 {
 	__stm32_exti_isr(0, 2, arg);
 }
 
-static inline void __stm32_exti_isr_2_3(void *arg)
+static inline void __stm32_exti_isr_2_3(const void *arg)
 {
 	__stm32_exti_isr(2, 4, arg);
 }
 
-static inline void __stm32_exti_isr_4_15(void *arg)
+static inline void __stm32_exti_isr_4_15(const void *arg)
 {
 	__stm32_exti_isr(4, 16, arg);
 }
 
 #else
-static inline void __stm32_exti_isr_0(void *arg)
+static inline void __stm32_exti_isr_0(const void *arg)
 {
 	__stm32_exti_isr(0, 1, arg);
 }
 
-static inline void __stm32_exti_isr_1(void *arg)
+static inline void __stm32_exti_isr_1(const void *arg)
 {
 	__stm32_exti_isr(1, 2, arg);
 }
 
-static inline void __stm32_exti_isr_2(void *arg)
+static inline void __stm32_exti_isr_2(const void *arg)
 {
 	__stm32_exti_isr(2, 3, arg);
 }
 
-static inline void __stm32_exti_isr_3(void *arg)
+static inline void __stm32_exti_isr_3(const void *arg)
 {
 	__stm32_exti_isr(3, 4, arg);
 }
 
-static inline void __stm32_exti_isr_4(void *arg)
+static inline void __stm32_exti_isr_4(const void *arg)
 {
 	__stm32_exti_isr(4, 5, arg);
 }
 
 #if defined(CONFIG_SOC_SERIES_STM32MP1X) || \
 	defined(CONFIG_SOC_SERIES_STM32L5X)
-static inline void __stm32_exti_isr_5(void *arg)
+static inline void __stm32_exti_isr_5(const void *arg)
 {
 	__stm32_exti_isr(5, 6, arg);
 }
 
-static inline void __stm32_exti_isr_6(void *arg)
+static inline void __stm32_exti_isr_6(const void *arg)
 {
 	__stm32_exti_isr(6, 7, arg);
 }
 
-static inline void __stm32_exti_isr_7(void *arg)
+static inline void __stm32_exti_isr_7(const void *arg)
 {
 	__stm32_exti_isr(7, 8, arg);
 }
 
-static inline void __stm32_exti_isr_8(void *arg)
+static inline void __stm32_exti_isr_8(const void *arg)
 {
 	__stm32_exti_isr(8, 9, arg);
 }
 
-static inline void __stm32_exti_isr_9(void *arg)
+static inline void __stm32_exti_isr_9(const void *arg)
 {
 	__stm32_exti_isr(9, 10, arg);
 }
 
-static inline void __stm32_exti_isr_10(void *arg)
+static inline void __stm32_exti_isr_10(const void *arg)
 {
 	__stm32_exti_isr(10, 11, arg);
 }
 
-static inline void __stm32_exti_isr_11(void *arg)
+static inline void __stm32_exti_isr_11(const void *arg)
 {
 	__stm32_exti_isr(11, 12, arg);
 }
 
-static inline void __stm32_exti_isr_12(void *arg)
+static inline void __stm32_exti_isr_12(const void *arg)
 {
 	__stm32_exti_isr(12, 13, arg);
 }
 
-static inline void __stm32_exti_isr_13(void *arg)
+static inline void __stm32_exti_isr_13(const void *arg)
 {
 	__stm32_exti_isr(13, 14, arg);
 }
 
-static inline void __stm32_exti_isr_14(void *arg)
+static inline void __stm32_exti_isr_14(const void *arg)
 {
 	__stm32_exti_isr(14, 15, arg);
 }
 
-static inline void __stm32_exti_isr_15(void *arg)
+static inline void __stm32_exti_isr_15(const void *arg)
 {
 	__stm32_exti_isr(15, 16, arg);
 }
 #endif
 
-static inline void __stm32_exti_isr_9_5(void *arg)
+static inline void __stm32_exti_isr_9_5(const void *arg)
 {
 	__stm32_exti_isr(5, 10, arg);
 }
 
-static inline void __stm32_exti_isr_15_10(void *arg)
+static inline void __stm32_exti_isr_15_10(const void *arg)
 {
 	__stm32_exti_isr(10, 16, arg);
 }
@@ -361,29 +361,29 @@ static inline void __stm32_exti_isr_15_10(void *arg)
 	defined(CONFIG_SOC_SERIES_STM32F7X) || \
 	defined(CONFIG_SOC_SERIES_STM32F2X) || \
 	defined(CONFIG_SOC_SERIES_STM32MP1X)
-static inline void __stm32_exti_isr_16(void *arg)
+static inline void __stm32_exti_isr_16(const void *arg)
 {
 	__stm32_exti_isr(16, 17, arg);
 }
 
-static inline void __stm32_exti_isr_18(void *arg)
+static inline void __stm32_exti_isr_18(const void *arg)
 {
 	__stm32_exti_isr(18, 19, arg);
 }
 
-static inline void __stm32_exti_isr_21(void *arg)
+static inline void __stm32_exti_isr_21(const void *arg)
 {
 	__stm32_exti_isr(21, 22, arg);
 }
 
-static inline void __stm32_exti_isr_22(void *arg)
+static inline void __stm32_exti_isr_22(const void *arg)
 {
 	__stm32_exti_isr(22, 23, arg);
 }
 #endif
 #if defined(CONFIG_SOC_SERIES_STM32F7X) || \
 	defined(CONFIG_SOC_SERIES_STM32MP1X)
-static inline void __stm32_exti_isr_23(void *arg)
+static inline void __stm32_exti_isr_23(const void *arg)
 {
 	__stm32_exti_isr(23, 24, arg);
 }
diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c
index c729e3d3093..9ce948c79f3 100644
--- a/drivers/interrupt_controller/intc_plic.c
+++ b/drivers/interrupt_controller/intc_plic.c
@@ -134,7 +134,7 @@ int riscv_plic_get_irq(void)
 	return save_irq;
 }
 
-static void plic_irq_handler(void *arg)
+static void plic_irq_handler(const void *arg)
 {
 	volatile struct plic_regs_t *regs =
 	    (volatile struct plic_regs_t *) PLIC_REG;
diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
index 8c2a4a0b780..b01a539584b 100644
--- a/drivers/interrupt_controller/intc_rv32m1_intmux.c
+++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c
@@ -109,7 +109,7 @@ static int rv32m1_intmux_get_line_state(const struct device *dev,
 #define ISR_ENTRY(channel, line) \
 	((channel) * CONFIG_MAX_IRQ_PER_AGGREGATOR + line)
 
-static void rv32m1_intmux_isr(void *arg)
+static void rv32m1_intmux_isr(const void *arg)
 {
 	const struct device *dev = DEVICE_GET(intmux);
 	INTMUX_Type *regs = DEV_REGS(dev);
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index e08cfe79bc2..d890f53441d 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -53,9 +53,8 @@ static inline void set_eic_enable(bool on)
 #endif
 }
 
-static void sam0_eic_isr(void *arg)
+static void sam0_eic_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct sam0_eic_data *const dev_data = DEV_DATA(dev);
 	uint16_t bits = EIC->INTFLAG.reg;
 	uint32_t line_index;
diff --git a/drivers/interrupt_controller/intc_swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c
index 6fe226d4cdd..194201411a7 100644
--- a/drivers/interrupt_controller/intc_swerv_pic.c
+++ b/drivers/interrupt_controller/intc_swerv_pic.c
@@ -114,7 +114,7 @@ int swerv_pic_get_irq(void)
 	return save_irq;
 }
 
-static void swerv_pic_irq_handler(void *arg)
+static void swerv_pic_irq_handler(const void *arg)
 {
 	uint32_t tmp;
 	uint32_t irq;
diff --git a/drivers/interrupt_controller/intc_vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c
index 599b19cde92..1f74df85d46 100644
--- a/drivers/interrupt_controller/intc_vexriscv_litex.c
+++ b/drivers/interrupt_controller/intc_vexriscv_litex.c
@@ -56,7 +56,7 @@ static inline void vexriscv_litex_irq_setie(uint32_t ie)
 	}
 }
 
-static void vexriscv_litex_irq_handler(void *device)
+static void vexriscv_litex_irq_handler(const void *device)
 {
 	struct _isr_table_entry *ite;
 	uint32_t pending, mask, irqs;
diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c
index cd28bda1ac5..0deec23d505 100644
--- a/drivers/ipm/ipm_imx.c
+++ b/drivers/ipm/ipm_imx.c
@@ -31,9 +31,8 @@ struct imx_mu_data {
 	void *user_data;
 };
 
-static void imx_mu_isr(void *arg)
+static void imx_mu_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct imx_mu_config *config = dev->config;
 	MU_Type *base = MU(config);
 	struct imx_mu_data *data = dev->data;
diff --git a/drivers/ipm/ipm_intel_adsp.c b/drivers/ipm/ipm_intel_adsp.c
index 775c0b561cd..b6df5eec014 100644
--- a/drivers/ipm/ipm_intel_adsp.c
+++ b/drivers/ipm/ipm_intel_adsp.c
@@ -45,9 +45,8 @@ struct ipm_adsp_data {
 	void *user_data;
 };
 
-static void ipm_adsp_isr(void *arg)
+static void ipm_adsp_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct ipm_adsp_data *data = dev->data;
 	uint32_t dipcctl, dipcie, dipct;
 
diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c
index 9d37a62e848..c2d9dc714a0 100644
--- a/drivers/ipm/ipm_mcux.c
+++ b/drivers/ipm/ipm_mcux.c
@@ -34,9 +34,8 @@ struct mcux_mailbox_data {
 	void *callback_ctx;
 };
 
-static void mcux_mailbox_isr(void *arg)
+static void mcux_mailbox_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct mcux_mailbox_data *data = dev->data;
 	const struct mcux_mailbox_config *config = dev->config;
 	mailbox_cpu_id_t cpu_id;
diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c
index c9d3aeeecd1..16610cd87e9 100644
--- a/drivers/ipm/ipm_mhu.c
+++ b/drivers/ipm/ipm_mhu.c
@@ -124,9 +124,8 @@ static int ipm_mhu_init(const struct device *d)
 	return 0;
 }
 
-static void ipm_mhu_isr(void *arg)
+static void ipm_mhu_isr(const struct device *d)
 {
-	const struct device *d = arg;
 	struct ipm_mhu_data *driver_data = DEV_DATA(d);
 	enum ipm_mhu_cpu_id_t cpu_id;
 	uint32_t ipm_mhu_status;
diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c
index 0556c33d145..93a5af5fb79 100644
--- a/drivers/ipm/ipm_stm32_ipcc.c
+++ b/drivers/ipm/ipm_stm32_ipcc.c
@@ -101,9 +101,8 @@ struct stm32_ipcc_mbx_data {
 
 static struct stm32_ipcc_mbx_data stm32_IPCC_data;
 
-static void stm32_ipcc_mailbox_rx_isr(void *arg)
+static void stm32_ipcc_mailbox_rx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
 	unsigned int value = 0;
@@ -130,9 +129,8 @@ static void stm32_ipcc_mailbox_rx_isr(void *arg)
 	}
 }
 
-static void stm32_ipcc_mailbox_tx_isr(void *arg)
+static void stm32_ipcc_mailbox_tx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
 	uint32_t mask, i;
diff --git a/drivers/kscan/kscan_mchp_xec.c b/drivers/kscan/kscan_mchp_xec.c
index 5e964d60847..322f72f12a8 100644
--- a/drivers/kscan/kscan_mchp_xec.c
+++ b/drivers/kscan/kscan_mchp_xec.c
@@ -145,7 +145,7 @@ static bool read_keyboard_matrix(uint8_t *new_state)
 	return key_event != 0U ? true : false;
 }
 
-static void scan_matrix_xec_isr(void *arg)
+static void scan_matrix_xec_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c
index e65a041f57d..b0b7bbbfb89 100644
--- a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c
+++ b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c
@@ -304,9 +304,8 @@ static void iproc_pcie_hot_reset(void *arg)
 #endif
 
 #if DT_INST_IRQ_HAS_NAME(0, flr)
-static void iproc_pcie_flr(void *arg)
+static void iproc_pcie_flr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct iproc_pcie_ep_config *cfg = dev->config;
 	struct iproc_pcie_ep_ctx *ctx = dev->data;
 	void *reset_data;
diff --git a/drivers/peci/peci_mchp_xec.c b/drivers/peci/peci_mchp_xec.c
index 00ce44ae64f..626ac9b3b77 100644
--- a/drivers/peci/peci_mchp_xec.c
+++ b/drivers/peci/peci_mchp_xec.c
@@ -293,7 +293,7 @@ static int peci_xec_transfer(const struct device *dev, struct peci_msg *msg)
 }
 
 #ifdef CONFIG_PECI_INTERRUPT_DRIVEN
-static void peci_xec_isr(void *arg)
+static void peci_xec_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	PECI_Type *base = peci_xec_config.base;
diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c
index 010d1c9418d..eace24fac70 100644
--- a/drivers/ps2/ps2_mchp_xec.c
+++ b/drivers/ps2/ps2_mchp_xec.c
@@ -149,9 +149,8 @@ static int ps2_xec_enable_interface(const struct device *dev)
 
 	return 0;
 }
-static void ps2_xec_isr(void *arg)
+static void ps2_xec_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct ps2_xec_config *config = dev->config;
 	struct ps2_xec_data *data = dev->data;
 	PS2_Type *base = config->base;
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index c85a6c3709b..40c815bd14c 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -232,9 +232,8 @@ static void leuart_gecko_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void leuart_gecko_isr(void *arg)
+static void leuart_gecko_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct leuart_gecko_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c
index 09fee5cef14..82f20fc1606 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/drivers/serial/uart_cc13xx_cc26xx.c
@@ -348,9 +348,8 @@ static void uart_cc13xx_cc26xx_irq_callback_set(const struct device *dev,
 	data->user_data = user_data;
 }
 
-static void uart_cc13xx_cc26xx_isr(void *arg)
+static void uart_cc13xx_cc26xx_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct uart_cc13xx_cc26xx_data *data = get_dev_data(dev);
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c
index 79ca7d6e144..e4b0567d716 100644
--- a/drivers/serial/uart_cc32xx.c
+++ b/drivers/serial/uart_cc32xx.c
@@ -35,7 +35,7 @@ struct uart_cc32xx_dev_data_t {
 DEVICE_DECLARE(uart_cc32xx_0);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static void uart_cc32xx_isr(void *arg);
+static void uart_cc32xx_isr(const struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cc32xx_dev_cfg_0 = {
@@ -273,9 +273,8 @@ static void uart_cc32xx_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_cc32xx_isr(void *arg)
+static void uart_cc32xx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct uart_device_config *config = DEV_CFG(dev);
 	struct uart_cc32xx_dev_data_t * const dev_data = DEV_DATA(dev);
 
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index 4bfba1c6212..afeb6cd42de 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -84,7 +84,7 @@ struct uart_cmsdk_apb_dev_data {
 	((volatile struct uart_cmsdk_apb *)(DEV_CFG(dev))->base)
 
 static const struct uart_driver_api uart_cmsdk_apb_driver_api;
-static void uart_cmsdk_apb_isr(void *arg);
+static void uart_cmsdk_apb_isr(const struct device *dev);
 
 /**
  * @brief Set the baud rate
@@ -419,9 +419,8 @@ static void uart_cmsdk_apb_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-void uart_cmsdk_apb_isr(void *arg)
+void uart_cmsdk_apb_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev);
 	struct uart_cmsdk_apb_dev_data *data = DEV_DATA(dev);
 
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index d6a33a97b33..87da9ed7935 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -431,9 +431,8 @@ static void uart_esp32_irq_callback_set(const struct device *dev,
 	DEV_DATA(dev)->irq_cb_data = cb_data;
 }
 
-void uart_esp32_isr(void *arg)
+void uart_esp32_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_esp32_data *data = DEV_DATA(dev);
 
 	/* Verify if the callback has been registered */
diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c
index 6b3ffab59cc..94038c22f23 100644
--- a/drivers/serial/uart_gecko.c
+++ b/drivers/serial/uart_gecko.c
@@ -275,9 +275,8 @@ static void uart_gecko_irq_callback_set(struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void uart_gecko_isr(void *arg)
+static void uart_gecko_isr(const struct device *dev)
 {
-	struct device *dev = arg;
 	struct uart_gecko_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
index 03a10881d6a..23906d3230c 100644
--- a/drivers/serial/uart_imx.c
+++ b/drivers/serial/uart_imx.c
@@ -250,9 +250,8 @@ static void uart_imx_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-void uart_imx_isr(void *arg)
+void uart_imx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct imx_uart_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_liteuart.c b/drivers/serial/uart_liteuart.c
index 63b84553666..cb3b421c474 100644
--- a/drivers/serial/uart_liteuart.c
+++ b/drivers/serial/uart_liteuart.c
@@ -272,9 +272,8 @@ static void uart_liteuart_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void liteuart_uart_irq_handler(void *arg)
+static void liteuart_uart_irq_handler(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct uart_liteuart_data *data = DEV_DATA(dev);
 	int key = irq_lock();
 
diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c
index 9ca755f9c6a..32e38eb19e9 100644
--- a/drivers/serial/uart_lpc11u6x.c
+++ b/drivers/serial/uart_lpc11u6x.c
@@ -332,9 +332,8 @@ static void lpc11u6x_uart0_irq_callback_set(const struct device *dev,
 	data->cb_data = user_data;
 }
 
-static void lpc11u6x_uart0_isr(void *arg)
+static void lpc11u6x_uart0_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct lpc11u6x_uart0_data *data = DEV_DATA(dev);
 
 	if (data->cb) {
@@ -770,9 +769,10 @@ static void lpc11u6x_uartx_isr(const struct device *dev)
 	}
 }
 
-static void lpc11u6x_uartx_shared_isr(void *arg)
+static void lpc11u6x_uartx_shared_isr(const void *arg)
 {
-	struct lpc11u6x_uartx_shared_irq *shared_irq = arg;
+	struct lpc11u6x_uartx_shared_irq *shared_irq =
+		(struct lpc11u6x_uartx_shared_irq *)arg;
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(shared_irq->devices); i++) {
diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c
index 2f56ad5dcf0..9b633ac57ff 100644
--- a/drivers/serial/uart_mcux.c
+++ b/drivers/serial/uart_mcux.c
@@ -306,9 +306,8 @@ static void uart_mcux_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void uart_mcux_isr(void *arg)
+static void uart_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_mcux_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c
index 345b931dec6..3764527eb12 100644
--- a/drivers/serial/uart_mcux_flexcomm.c
+++ b/drivers/serial/uart_mcux_flexcomm.c
@@ -231,9 +231,8 @@ static void mcux_flexcomm_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void mcux_flexcomm_isr(void *arg)
+static void mcux_flexcomm_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct mcux_flexcomm_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_mcux_iuart.c b/drivers/serial/uart_mcux_iuart.c
index 24c3b405a3a..47747e9f702 100644
--- a/drivers/serial/uart_mcux_iuart.c
+++ b/drivers/serial/uart_mcux_iuart.c
@@ -211,9 +211,8 @@ static void mcux_iuart_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void mcux_iuart_isr(void *arg)
+static void mcux_iuart_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct mcux_iuart_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c
index 2b450411308..810bfca5e43 100644
--- a/drivers/serial/uart_mcux_lpsci.c
+++ b/drivers/serial/uart_mcux_lpsci.c
@@ -222,9 +222,8 @@ static void mcux_lpsci_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void mcux_lpsci_isr(void *arg)
+static void mcux_lpsci_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct mcux_lpsci_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index 9dc8df0976a..13a0892f876 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -222,9 +222,8 @@ static void mcux_lpuart_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void mcux_lpuart_isr(void *arg)
+static void mcux_lpuart_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct mcux_lpuart_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c
index d5b929ed1be..4af4f0f595f 100644
--- a/drivers/serial/uart_msp432p4xx.c
+++ b/drivers/serial/uart_msp432p4xx.c
@@ -36,7 +36,7 @@ struct uart_msp432p4xx_dev_data_t {
 DEVICE_DECLARE(uart_msp432p4xx_0);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static void uart_msp432p4xx_isr(void *arg);
+static void uart_msp432p4xx_isr(const struct device *dev);
 #endif
 
 static const struct uart_device_config uart_msp432p4xx_dev_cfg_0 = {
@@ -319,9 +319,8 @@ static void uart_msp432p4xx_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_msp432p4xx_isr(void *arg)
+static void uart_msp432p4xx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct uart_device_config *config = DEV_CFG(dev);
 	struct uart_msp432p4xx_dev_data_t * const dev_data = DEV_DATA(dev);
 	unsigned int int_status;
diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c
index b0c4e717f9c..cb6eebcd866 100644
--- a/drivers/serial/uart_npcx.c
+++ b/drivers/serial/uart_npcx.c
@@ -253,9 +253,8 @@ static void uart_npcx_irq_callback_set(const struct device *dev,
 	data->user_data = cb_data;
 }
 
-static void uart_npcx_isr(void *arg)
+static void uart_npcx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_npcx_data *data = DRV_DATA(dev);
 
 	if (data->user_cb) {
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 5d1c980ab23..e4cdc008d2e 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -236,7 +236,7 @@ static int uart_nrfx_poll_in(const struct device *dev, unsigned char *c)
 }
 
 #ifdef CONFIG_UART_0_ASYNC
-static void uart_nrfx_isr(void *arg);
+static void uart_nrfx_isr(const struct device *dev);
 #endif
 
 /**
@@ -255,7 +255,7 @@ static void uart_nrfx_poll_out(const struct device *dev, unsigned char c)
 		 * busy wait until transmission is finished.
 		 */
 		if (k_is_in_isr()) {
-			uart_nrfx_isr((void *) dev);
+			uart_nrfx_isr(dev);
 		}
 	}
 	/* Use tx_buffer_length as lock, this way uart_nrfx_tx will
@@ -729,10 +729,8 @@ static void rxto_isr(const struct device *dev)
 	rx_disabled_evt(dev);
 }
 
-void uart_nrfx_isr(void *arg)
+void uart_nrfx_isr(const struct device *uart)
 {
-	const struct device *uart = (const struct device *) arg;
-
 	if (nrf_uart_int_enable_check(uart0_addr, NRF_UART_INT_MASK_ERROR) &&
 	    nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_ERROR)) {
 		error_isr(uart);
@@ -940,10 +938,8 @@ static void uart_nrfx_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_nrfx_isr(void *arg)
+static void uart_nrfx_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
-
 	if (disable_tx_irq &&
 	    nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_TXDRDY)) {
 		nrf_uart_int_disable(uart0_addr, NRF_UART_INT_MASK_TXDRDY);
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index 7d80e1c3741..2951ab719ab 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -849,9 +849,8 @@ static void uart_ns16550_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_ns16550_isr(void *arg)
+static void uart_ns16550_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev);
 
 	if (dev_data->cb) {
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index be259fd5da8..cd9a975c090 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -395,9 +395,8 @@ static int pl011_init(const struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-void pl011_isr(void *arg)
+void pl011_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct pl011_data *data = DEV_DATA(dev);
 
 	/* Verify if the callback has been registered */
diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
index d3f2d5cec7d..83377b9a722 100644
--- a/drivers/serial/uart_rv32m1_lpuart.c
+++ b/drivers/serial/uart_rv32m1_lpuart.c
@@ -225,9 +225,8 @@ static void rv32m1_lpuart_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void rv32m1_lpuart_isr(void *arg)
+static void rv32m1_lpuart_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct rv32m1_lpuart_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c
index b4820b3606b..ab664df4b66 100644
--- a/drivers/serial/uart_sam.c
+++ b/drivers/serial/uart_sam.c
@@ -289,9 +289,8 @@ static void uart_sam_irq_callback_set(const struct device *dev,
 	dev_data->irq_cb_data = cb_data;
 }
 
-static void uart_sam_isr(void *arg)
+static void uart_sam_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_sam_dev_data *const dev_data = DEV_DATA(dev);
 
 	if (dev_data->irq_cb) {
diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c
index e318bcb325a..993d0097646 100644
--- a/drivers/serial/uart_sam0.c
+++ b/drivers/serial/uart_sam0.c
@@ -661,9 +661,8 @@ static void uart_sam0_poll_out(const struct device *dev, unsigned char c)
 
 #if CONFIG_UART_INTERRUPT_DRIVEN || CONFIG_UART_ASYNC_API
 
-static void uart_sam0_isr(void *arg)
+static void uart_sam0_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev);
 
 #if CONFIG_UART_INTERRUPT_DRIVEN
diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c
index 6738c900136..0c4f8b2fc74 100644
--- a/drivers/serial/uart_sifive.c
+++ b/drivers/serial/uart_sifive.c
@@ -317,9 +317,8 @@ static void uart_sifive_irq_callback_set(const struct device *dev,
 	data->cb_data = cb_data;
 }
 
-static void uart_sifive_irq_handler(void *arg)
+static void uart_sifive_irq_handler(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct uart_sifive_data *data = DEV_DATA(dev);
 
 	if (data->callback)
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 37b14b4ef1b..2f4f9b7e284 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -593,9 +593,8 @@ static void uart_stellaris_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_stellaris_isr(void *arg)
+static void uart_stellaris_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_stellaris_dev_data_t * const dev_data = DEV_DATA(dev);
 
 	if (dev_data->cb) {
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index b50ccacd800..0f06e16ac86 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -616,9 +616,8 @@ static void uart_stm32_irq_callback_set(const struct device *dev,
 	data->user_data = cb_data;
 }
 
-static void uart_stm32_isr(void *arg)
+static void uart_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct uart_stm32_data *data = DEV_DATA(dev);
 
 	if (data->user_cb) {
diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index 29613a4bb16..58e83c26b5d 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -1134,9 +1134,8 @@ static void uart_xlnx_ps_irq_callback_set(const struct device *dev,
  *
  * @return N/A
  */
-static void uart_xlnx_ps_isr(void *arg)
+static void uart_xlnx_ps_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	const struct uart_xlnx_ps_dev_data_t *data = DEV_DATA(dev);
 
 	if (data->user_cb) {
diff --git a/drivers/serial/uart_xlnx_uartlite.c b/drivers/serial/uart_xlnx_uartlite.c
index 1187c15189c..465456f4324 100644
--- a/drivers/serial/uart_xlnx_uartlite.c
+++ b/drivers/serial/uart_xlnx_uartlite.c
@@ -282,9 +282,8 @@ static void xlnx_uartlite_irq_callback_set(const struct device *dev,
 	data->callback_data = user_data;
 }
 
-static __unused void xlnx_uartlite_isr(void *arg)
+static __unused void xlnx_uartlite_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct xlnx_uartlite_data *data = dev->data;
 
 	if (data->callback) {
diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c
index 3ba00164a96..fc5f86ba40e 100644
--- a/drivers/serial/usart_sam.c
+++ b/drivers/serial/usart_sam.c
@@ -290,9 +290,8 @@ static void usart_sam_irq_callback_set(const struct device *dev,
 	dev_data->cb_data = cb_data;
 }
 
-static void usart_sam_isr(void *arg)
+static void usart_sam_isr(const struct device *dev)
 {
-	const struct device *dev = arg;
 	struct usart_sam_dev_data *const dev_data = DEV_DATA(dev);
 
 	if (dev_data->irq_cb) {
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index 03334869ebe..e3f98847a7d 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -409,9 +409,8 @@ static void spi_stm32_complete(struct spi_stm32_data *data, SPI_TypeDef *spi,
 }
 
 #ifdef CONFIG_SPI_STM32_INTERRUPT
-static void spi_stm32_isr(void *arg)
+static void spi_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *) arg;
 	const struct spi_stm32_config *cfg = dev->config;
 	struct spi_stm32_data *data = dev->data;
 	SPI_TypeDef *spi = cfg->spi;
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
index 5b9b311fb69..ce0ee69bde9 100644
--- a/drivers/spi/spi_mcux_dspi.c
+++ b/drivers/spi/spi_mcux_dspi.c
@@ -104,9 +104,8 @@ static int spi_mcux_transfer_next_packet(const struct device *dev)
 	       status == kDSPI_Busy ? -EBUSY : -EINVAL;
 }
 
-static void spi_mcux_isr(void *arg)
+static void spi_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct spi_mcux_config *config = dev->config;
 	struct spi_mcux_data *data = dev->data;
 	SPI_Type *base = config->base;
diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c
index fa1f2c0cddc..138211fac0a 100644
--- a/drivers/spi/spi_mcux_flexcomm.c
+++ b/drivers/spi/spi_mcux_flexcomm.c
@@ -93,9 +93,8 @@ static void spi_mcux_transfer_next_packet(const struct device *dev)
 	}
 }
 
-static void spi_mcux_isr(void *arg)
+static void spi_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct spi_mcux_config *config = dev->config;
 	struct spi_mcux_data *data = dev->data;
 	SPI_Type *base = config->base;
diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c
index becd9139958..9be68886c13 100644
--- a/drivers/spi/spi_mcux_lpspi.c
+++ b/drivers/spi/spi_mcux_lpspi.c
@@ -104,9 +104,8 @@ static void spi_mcux_transfer_next_packet(const struct device *dev)
 	}
 }
 
-static void spi_mcux_isr(void *arg)
+static void spi_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct spi_mcux_config *config = dev->config;
 	struct spi_mcux_data *data = dev->data;
 	LPSPI_Type *base = config->base;
diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c
index 67878da9f88..9de0c215a18 100644
--- a/drivers/spi/spi_rv32m1_lpspi.c
+++ b/drivers/spi/spi_rv32m1_lpspi.c
@@ -104,9 +104,8 @@ static void spi_mcux_transfer_next_packet(const struct device *dev)
 	}
 }
 
-static void spi_mcux_isr(void *arg)
+static void spi_mcux_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct spi_mcux_config *config = dev->config;
 	struct spi_mcux_data *data = dev->data;
 	LPSPI_Type *base = config->base;
diff --git a/drivers/spi/spi_xlnx_axi_quadspi.c b/drivers/spi/spi_xlnx_axi_quadspi.c
index a328c8d8dea..79a7dc834bc 100644
--- a/drivers/spi/spi_xlnx_axi_quadspi.c
+++ b/drivers/spi/spi_xlnx_axi_quadspi.c
@@ -383,9 +383,8 @@ static int xlnx_quadspi_release(const struct device *dev,
 	return 0;
 }
 
-static void xlnx_quadspi_isr(void *arg)
+static void xlnx_quadspi_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct xlnx_quadspi_config *config = dev->config;
 	struct xlnx_quadspi_data *data = dev->data;
 	struct spi_context *ctx = &data->ctx;
diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c
index 4266402d1ce..3dfe710b394 100644
--- a/drivers/timer/altera_avalon_timer_hal.c
+++ b/drivers/timer/altera_avalon_timer_hal.c
@@ -19,7 +19,7 @@ static uint32_t accumulated_cycle_count;
 
 static int32_t _sys_idle_elapsed_ticks = 1;
 
-static void timer_irq_handler(void *unused)
+static void timer_irq_handler(const void *unused)
 {
 	ARG_UNUSED(unused);
 
diff --git a/drivers/timer/apic_timer.c b/drivers/timer/apic_timer.c
index 3cdc963b5fd..22575d7ac62 100644
--- a/drivers/timer/apic_timer.c
+++ b/drivers/timer/apic_timer.c
@@ -132,7 +132,7 @@ uint32_t z_clock_elapsed(void)
 	return ticks;
 }
 
-static void isr(void *arg)
+static void isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
@@ -166,7 +166,7 @@ static void isr(void *arg)
 
 #else
 
-static void isr(void *arg)
+static void isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 21d661f96b6..30abf0953b4 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -219,7 +219,7 @@ static uint32_t elapsed(void)
  *
  * @return N/A
  */
-static void timer_int_handler(void *unused)
+static void timer_int_handler(const void *unused)
 {
 	ARG_UNUSED(unused);
 	uint32_t dticks;
diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c
index b470eb635d1..bbf95b30c06 100644
--- a/drivers/timer/arm_arch_timer.c
+++ b/drivers/timer/arm_arch_timer.c
@@ -18,7 +18,7 @@
 static struct k_spinlock lock;
 static volatile uint64_t last_cycle;
 
-static void arm_arch_timer_compare_isr(void *arg)
+static void arm_arch_timer_compare_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c
index 14c7172108a..2dbb655ffaf 100644
--- a/drivers/timer/cavs_timer.c
+++ b/drivers/timer/cavs_timer.c
@@ -60,7 +60,7 @@ static uint32_t count32(void)
 	return shim_regs->walclk32_lo;
 }
 
-static void compare_isr(void *arg)
+static void compare_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	uint64_t curr;
diff --git a/drivers/timer/cc13x2_cc26x2_rtc_timer.c b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
index 548d021fad3..6c0414a5e17 100644
--- a/drivers/timer/cc13x2_cc26x2_rtc_timer.c
+++ b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
@@ -88,7 +88,7 @@ static void setThreshold(uint32_t next)
 	irq_unlock(key);
 }
 
-void rtc_isr(void *arg)
+void rtc_isr(const void *arg)
 {
 #ifndef CONFIG_TICKLESS_KERNEL
 	uint64_t newThreshold;
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index a2b4a11d522..c803e90fafb 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -46,7 +46,7 @@ static unsigned int max_ticks;
 static unsigned int cyc_per_tick;
 static unsigned int last_count;
 
-static void hpet_isr(void *arg)
+static void hpet_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c
index ab896f5595c..3f6a3ea833c 100644
--- a/drivers/timer/litex_timer.c
+++ b/drivers/timer/litex_timer.c
@@ -28,7 +28,7 @@
 #define TIMER_ENABLE	0x1
 #define UPDATE_TOTAL	0x1
 
-static void litex_timer_irq_handler(void *device)
+static void litex_timer_irq_handler(const void *device)
 {
 	ARG_UNUSED(device);
 	int key = irq_lock();
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index 716a8059f07..d119c5c0fc6 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -198,7 +198,7 @@ static inline void program_max_cycles(void)
 }
 #endif
 
-void timer_int_handler(void *unused /* parameter is not used */
+void timer_int_handler(const void *unused /* parameter is not used */
 				 )
 {
 #ifdef CONFIG_EXECUTION_BENCHMARKING
diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c
index b4ae8c2cc31..06751268781 100644
--- a/drivers/timer/mchp_xec_rtos_timer.c
+++ b/drivers/timer/mchp_xec_rtos_timer.c
@@ -213,7 +213,7 @@ uint32_t z_clock_elapsed(void)
 	return ticks;
 }
 
-static void xec_rtos_timer_isr(void *arg)
+static void xec_rtos_timer_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
@@ -259,7 +259,7 @@ static void xec_rtos_timer_isr(void *arg)
 
 /* Non-tickless kernel build. */
 
-static void xec_rtos_timer_isr(void *arg)
+static void xec_rtos_timer_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index b7131e879b7..a5f082d5930 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -36,7 +36,7 @@ uint32_t z_timer_cycle_get_32(void)
  * Interrupt handler for the timer interrupt
  * Announce to the kernel that a number of ticks have passed
  */
-static void np_timer_isr(void *arg)
+static void np_timer_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index de35ccd3291..5383b89a714 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -166,7 +166,7 @@ static void set_protected_absolute_alarm(uint32_t cycles)
  * it by pointer at runtime, maybe?) so we don't have this leaky
  * symbol.
  */
-void rtc_nrf_isr(void *arg)
+void rtc_nrf_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 	event_clear();
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index d895e831226..eb6c50a95a4 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -56,7 +56,7 @@ static uint64_t mtime(void)
 #endif
 }
 
-static void timer_isr(void *arg)
+static void timer_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index f2bd200d1c5..0a76901b898 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -138,7 +138,7 @@ static void rtc_reset(void)
 #endif
 }
 
-static void rtc_isr(void *arg)
+static void rtc_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c
index bddec645124..20379ae9f92 100644
--- a/drivers/timer/xlnx_psttc_timer.c
+++ b/drivers/timer/xlnx_psttc_timer.c
@@ -65,7 +65,7 @@ static void update_match(uint32_t cycles, uint32_t match)
 	sys_write32(match, TIMER_BASE_ADDR + XTTCPS_MATCH_0_OFFSET);
 }
 
-static void ttc_isr(void *arg)
+static void ttc_isr(const void *arg)
 {
 	uint32_t cycles;
 	uint32_t ticks;
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index b32bc4c7890..3273fae1459 100644
--- a/drivers/timer/xtensa_sys_timer.c
+++ b/drivers/timer/xtensa_sys_timer.c
@@ -34,7 +34,7 @@ static uint32_t ccount(void)
 	return val;
 }
 
-static void ccompare_isr(void *arg)
+static void ccompare_isr(const void *arg)
 {
 	ARG_UNUSED(arg);
 
diff --git a/drivers/usb/device/usb_dc_dw.c b/drivers/usb/device/usb_dc_dw.c
index 099e756f483..b427342daba 100644
--- a/drivers/usb/device/usb_dc_dw.c
+++ b/drivers/usb/device/usb_dc_dw.c
@@ -638,7 +638,7 @@ static inline void usb_dw_int_oep_handler(void)
 	USB_DW->gintsts = USB_DW_GINTSTS_OEP_INT;
 }
 
-static void usb_dw_isr_handler(void *unused)
+static void usb_dw_isr_handler(const void *unused)
 {
 	uint32_t int_status;
 
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index 39edc7a2734..a58d8d42335 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -206,7 +206,7 @@ static struct usb_dc_stm32_ep_state *usb_dc_stm32_get_ep_state(uint8_t ep)
 	return ep_state_base + USB_EP_GET_IDX(ep);
 }
 
-static void usb_dc_stm32_isr(void *arg)
+static void usb_dc_stm32_isr(const void *arg)
 {
 	HAL_PCD_IRQHandler(&usb_dc_stm32_state.pcd);
 }
diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c
index f30fcb45057..5e6745655c2 100644
--- a/drivers/video/video_mcux_csi.c
+++ b/drivers/video/video_mcux_csi.c
@@ -349,7 +349,7 @@ static int video_mcux_csi_get_caps(const struct device *dev,
 }
 
 extern void CSI_DriverIRQHandler(void);
-static void video_mcux_csi_isr(void *p)
+static void video_mcux_csi_isr(const void *p)
 {
 	ARG_UNUSED(p);
 	CSI_DriverIRQHandler();
diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c
index 287c94a6666..e916346aa7c 100644
--- a/drivers/watchdog/wdt_gecko.c
+++ b/drivers/watchdog/wdt_gecko.c
@@ -230,9 +230,8 @@ static int wdt_gecko_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
-static void wdt_gecko_isr(void *arg)
+static void wdt_gecko_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct wdt_gecko_cfg *config = DEV_CFG(dev);
 	struct wdt_gecko_data *data = DEV_DATA(dev);
 	WDOG_TypeDef *wdog = config->base;
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index 706e26973be..40185401102 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -132,9 +132,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;
diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c
index 74d4982cdcf..98c3f3f68f3 100644
--- a/drivers/watchdog/wdt_mcux_wdog32.c
+++ b/drivers/watchdog/wdt_mcux_wdog32.c
@@ -153,9 +153,8 @@ static int mcux_wdog32_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
-static void mcux_wdog32_isr(void *arg)
+static void mcux_wdog32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_wdog32_config *config = dev->config;
 	struct mcux_wdog32_data *data = dev->data;
 	WDOG_Type *base = config->base;
diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c
index 962ae9819f9..c2ca8fb80ab 100644
--- a/drivers/watchdog/wdt_mcux_wwdt.c
+++ b/drivers/watchdog/wdt_mcux_wwdt.c
@@ -131,9 +131,8 @@ static int mcux_wwdt_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
-static void mcux_wwdt_isr(void *arg)
+static void mcux_wwdt_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	const struct mcux_wwdt_config *config = dev->config;
 	struct mcux_wwdt_data *data = dev->data;
 	WWDT_Type *base = config->base;
diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c
index a9486de4a06..82b899a5c11 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.c
+++ b/drivers/watchdog/wdt_wwdg_stm32.c
@@ -221,9 +221,8 @@ static int wwdg_stm32_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
-void wwdg_stm32_isr(void *arg)
+void wwdg_stm32_isr(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
 	struct wwdg_stm32_data *data = WWDG_STM32_DATA(dev);
 	WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 6639242c76e..8a5721bbbf1 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -84,7 +84,7 @@ ISR_DIRECT_DECLARE(radio_nrf5_isr)
 	return 1;
 }
 
-static void rtc0_nrf5_isr(void *arg)
+static void rtc0_nrf5_isr(const void *arg)
 {
 	DEBUG_TICKER_ISR(1);
 
@@ -105,7 +105,7 @@ static void rtc0_nrf5_isr(void *arg)
 	DEBUG_TICKER_ISR(0);
 }
 
-static void swi_lll_nrf5_isr(void *arg)
+static void swi_lll_nrf5_isr(const void *arg)
 {
 	DEBUG_RADIO_ISR(1);
 
@@ -116,7 +116,7 @@ static void swi_lll_nrf5_isr(void *arg)
 
 #if defined(CONFIG_BT_CTLR_LOW_LAT) || \
 	(CONFIG_BT_CTLR_ULL_HIGH_PRIO != CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void swi_ull_low_nrf5_isr(void *arg)
+static void swi_ull_low_nrf5_isr(const void *arg)
 {
 	DEBUG_TICKER_JOB(1);
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
index 43faa27c1e7..660ed0f57e8 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
@@ -66,7 +66,7 @@ static void ticker_op_job_disable(uint32_t status, void *op_context);
 #endif
 #endif /* CONFIG_BT_CTLR_LOW_LAT */
 
-static void rtc0_rv32m1_isr(void *arg)
+static void rtc0_rv32m1_isr(const void *arg)
 {
 	DEBUG_TICKER_ISR(1);
 
@@ -87,7 +87,7 @@ static void rtc0_rv32m1_isr(void *arg)
 	DEBUG_TICKER_ISR(0);
 }
 
-static void swi_lll_rv32m1_isr(void *arg)
+static void swi_lll_rv32m1_isr(const void *arg)
 {
 	DEBUG_RADIO_ISR(1);
 
@@ -98,7 +98,7 @@ static void swi_lll_rv32m1_isr(void *arg)
 
 #if defined(CONFIG_BT_CTLR_LOW_LAT) || \
 	(CONFIG_BT_CTLR_ULL_HIGH_PRIO != CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void swi_ull_low_rv32m1_isr(void *arg)
+static void swi_ull_low_rv32m1_isr(const void *arg)
 {
 	DEBUG_TICKER_JOB(1);
 
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index 6c07e3d29d4..ef7a8ec6f96 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -123,14 +123,14 @@ ISR_DIRECT_DECLARE(isr2)
 }
 #endif
 
-void isr3(void *param)
+void isr3(const void *param)
 {
 	printk("%s ran with parameter %p\n", __func__, param);
 	trigger_check[ISR3_OFFSET]++;
 }
 
 #ifdef ISR4_OFFSET
-void isr4(void *param)
+void isr4(const void *param)
 {
 	printk("%s ran with parameter %p\n", __func__, param);
 	trigger_check[ISR4_OFFSET]++;