diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index d20e54942d5..706c002e7b0 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -838,12 +838,13 @@ DECLARE_DEVICE_INIT_CONFIG(i2c_0,
 			   &i2c_config_dw_0);
 
 pre_kernel_late_init(i2c_0, &i2c_0_runtime);
+struct device *i2c_dw_isr_0_device = SYS_GET_DEVICE(i2c_0);
 
 #ifdef CONFIG_I2C_DW_0_IRQ_DIRECT
 IRQ_CONNECT_STATIC(i2c_dw_0,
 		   CONFIG_I2C_DW_0_IRQ,
 		   CONFIG_I2C_DW_0_INT_PRIORITY,
-		   i2c_dw_isr_0,
+		   i2c_dw_isr,
 		   0);
 #endif
 
@@ -864,11 +865,4 @@ void i2c_config_0(struct device *port)
 #endif
 }
 
-#ifdef CONFIG_I2C_DW_0_IRQ_DIRECT
-void i2c_dw_isr_0(void *unused)
-{
-	i2c_dw_isr(&__initconfig_i2c_0);
-}
-#endif
-
 #endif /* CONFIG_I2C_DW_0 */
diff --git a/drivers/i2c/i2c_static_irq_stubs.S b/drivers/i2c/i2c_static_irq_stubs.S
index ea621eb87ff..27f28d5b457 100644
--- a/drivers/i2c/i2c_static_irq_stubs.S
+++ b/drivers/i2c/i2c_static_irq_stubs.S
@@ -29,7 +29,7 @@
 
 #if defined(CONFIG_I2C_DW_0)
 #ifdef CONFIG_IOAPIC
-    ioapic_mkstub i2c_dw_0 i2c_dw_isr_0 0
+    ioapic_mkstub i2c_dw_0 i2c_dw_isr i2c_dw_isr_0_device
 #endif
 #endif /* CONFIG_I2C_DW_0 */