[nrf fromtree] i2c: i2c_nrfx_twim: update callback context to dev

Change the callback context to the dev pointer instead of the data pointer, as the dev pointer is needed by RTIO. Signed-off-by: Jordan Yates <[email protected]> (cherry picked from commit 627be7d)
nrfconnect · Dec 3, 2024 · d96f9a8 · d96f9a8
1 parent 83ac469
commit d96f9a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
@@ -173,7 +173,8 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 
 static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 {
-	struct i2c_nrfx_twim_data *dev_data = p_context;
+	const struct device *dev = p_context;
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
 
 	switch (p_event->type) {
 	case NRFX_TWIM_EVT_DONE:

diff --git a/drivers/i2c/i2c_nrfx_twim_common.c b/drivers/i2c/i2c_nrfx_twim_common.c
@@ -130,8 +130,8 @@ int i2c_nrfx_twim_common_init(const struct device *dev)
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 
-	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler, data) !=
-	    NRFX_SUCCESS) {
+	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler,
+			   (void *)dev) != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EIO;
 	}