[nrf fromlist] drivers: i2c: i2c_nrfx_twim: Align shim to new error handling

Aligned nrfx_twim shim to new errno error handling
in NRFX.

Upstream PR #: 98569

Signed-off-by: Adam Kondraciuk <[email protected]>

Author: adamkondraciuk

drivers/i2c/i2c_nrfx_twim.c

@@ -32,7 +32,7 @@ struct i2c_nrfx_twim_data {
 	nrfx_twim_t twim;
 	struct k_sem transfer_sync;
 	struct k_sem completion_sync;
-	volatile nrfx_err_t res;
+	volatile int res;
 };
 
 int i2c_nrfx_twim_exclusive_access_acquire(const struct device *dev, k_timeout_t timeout)
@@ -163,7 +163,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 			break;
 		}
 
-		if (dev_data->res != NRFX_SUCCESS) {
+		if (dev_data->res < 0) {
 			ret = -EIO;
 			break;
 		}
@@ -199,16 +199,16 @@ static void event_handler(nrfx_twim_event_t const *p_event, void *p_context)
 
 	switch (p_event->type) {
 	case NRFX_TWIM_EVT_DONE:
-		dev_data->res = NRFX_SUCCESS;
+		dev_data->res = 0;
 		break;
 	case NRFX_TWIM_EVT_ADDRESS_NACK:
-		dev_data->res = NRFX_ERROR_DRV_TWI_ERR_ANACK;
+		dev_data->res = -EFAULT;
 		break;
 	case NRFX_TWIM_EVT_DATA_NACK:
-		dev_data->res = NRFX_ERROR_DRV_TWI_ERR_DNACK;
+		dev_data->res = -EAGAIN;
 		break;
 	default:
-		dev_data->res = NRFX_ERROR_INTERNAL;
+		dev_data->res = -EIO;
 		break;
 	}
 

drivers/i2c/i2c_nrfx_twim_common.c

@@ -20,7 +20,7 @@ int i2c_nrfx_twim_recover_bus(const struct device *dev)
 	enum pm_device_state state;
 	uint32_t scl_pin;
 	uint32_t sda_pin;
-	nrfx_err_t err;
+	int err;
 
 	scl_pin = nrf_twim_scl_pin_get(config->twim->p_twim);
 	sda_pin = nrf_twim_sda_pin_get(config->twim->p_twim);
@@ -39,7 +39,7 @@ int i2c_nrfx_twim_recover_bus(const struct device *dev)
 		nrfx_twim_enable(config->twim);
 	}
 
-	return (err == NRFX_SUCCESS ? 0 : -EBUSY);
+	return err;
 }
 
 int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config)
@@ -80,8 +80,6 @@ int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t
 		.p_primary_buf = buf,
 		.primary_length = buf_len,
 	};
-	nrfx_err_t res;
-	int ret = 0;
 
 	if (buf_len > config->max_transfer_size) {
 		LOG_ERR("Trying to transfer more than the maximum size "
@@ -90,16 +88,8 @@ int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t
 		return -ENOSPC;
 	}
 
-	res = nrfx_twim_xfer(config->twim, &cur_xfer,
-			     (flags & I2C_MSG_STOP) ? 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
-	if (res != NRFX_SUCCESS) {
-		if (res == NRFX_ERROR_BUSY) {
-			ret = -EBUSY;
-		} else {
-			ret = -EIO;
-		}
-	}
-	return ret;
+	return nrfx_twim_xfer(config->twim, &cur_xfer,
+			      (flags & I2C_MSG_STOP) ? 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
 }
 
 void twim_nrfx_pm_resume(const struct device *dev)
@@ -142,8 +132,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,
-			   (void *)dev) != NRFX_SUCCESS) {
+	if (nrfx_twim_init(config->twim, &config->twim_config, config->event_handler, (void *)dev) <
+	    0) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EIO;
 	}