samples: bluetooth: Fix usage of nrfx error codes

Since nrfx 4, driver APIs return errno values. Comparing
against NRFX_SUCCESS is therefore wrong.
Unfortunately such cases cannot be found by enabling compiler
warnings.

Signed-off-by: Rubin Gerritsen <[email protected]>

Author: rugeGerritsen

samples/bluetooth/conn_time_sync/src/controller_time_nrf52.c

@@ -121,8 +121,8 @@ static int timer_config(void)
 	uint32_t tep;
 
 	ret = nrfx_timer_init(&app_timer_instance, &timer_cfg, unused_timer_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing timer (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing timer (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 

samples/bluetooth/conn_time_sync/src/controller_time_nrf53_app.c

@@ -95,8 +95,8 @@ static int timer_config(void)
 	uint32_t tep = nrfx_timer_task_address_get(&app_timer_instance, NRF_TIMER_TASK_CLEAR);
 
 	ret = nrfx_timer_init(&app_timer_instance, &timer_cfg, unused_timer_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing timer (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing timer (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 

samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c

@@ -42,8 +42,8 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	};
 
 	ret = nrfx_grtc_syscounter_cc_absolute_set(&chan_data, timestamp_us, false);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed setting CC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed setting CC (ret: %d)\n", ret);
 	}
 }
 

samples/bluetooth/direct_test_mode/src/dtm.c

@@ -795,15 +795,15 @@ BUILD_ASSERT(false, "No Clock Control driver");
 
 static int timer_init(void)
 {
-	nrfx_err_t err;
+	int err;
 	nrfx_timer_config_t timer_cfg = {
 		.frequency = NRFX_MHZ_TO_HZ(1),
 		.mode      = NRF_TIMER_MODE_TIMER,
 		.bit_width = NRF_TIMER_BIT_WIDTH_16,
 	};
 
 	err = nrfx_timer_init(&dtm_inst.timer, &timer_cfg, dtm_timer_handler);
-	if (err != NRFX_SUCCESS) {
+	if (err != 0) {
 		printk("nrfx_timer_init failed with: %d\n", err);
 		return -EAGAIN;
 	}
@@ -817,7 +817,7 @@ static int timer_init(void)
 #if NRF52_ERRATA_172_PRESENT
 static int anomaly_timer_init(void)
 {
-	nrfx_err_t err;
+	int err;
 	nrfx_timer_config_t timer_cfg = {
 		.frequency = NRFX_KHZ_TO_HZ(125),
 		.mode      = NRF_TIMER_MODE_TIMER,
@@ -826,7 +826,7 @@ static int anomaly_timer_init(void)
 
 	err = nrfx_timer_init(&dtm_inst.anomaly_timer, &timer_cfg,
 			      anomaly_timer_handler);
-	if (err != NRFX_SUCCESS) {
+	if (err != 0) {
 		printk("nrfx_timer_init failed with: %d\n", err);
 		return -EAGAIN;
 	}

samples/bluetooth/iso_time_sync/src/controller_time_nrf52.c

@@ -121,8 +121,8 @@ static int timer_config(void)
 	uint32_t tep = nrfx_timer_task_address_get(&app_timer_instance, NRF_TIMER_TASK_CLEAR);
 
 	ret = nrfx_timer_init(&app_timer_instance, &timer_cfg, unused_timer_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing timer (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing timer (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 

samples/bluetooth/iso_time_sync/src/controller_time_nrf53_app.c

@@ -95,8 +95,8 @@ static int timer_config(void)
 	uint32_t tep = nrfx_timer_task_address_get(&app_timer_instance, NRF_TIMER_TASK_CLEAR);
 
 	ret = nrfx_timer_init(&app_timer_instance, &timer_cfg, unused_timer_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing timer (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing timer (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 

samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c

@@ -42,8 +42,8 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	};
 
 	ret = nrfx_grtc_syscounter_cc_absolute_set(&chan_data, timestamp_us, false);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed setting CC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed setting CC (ret: %d)\n", ret);
 	}
 }