samples: bluetooth: cleanup scan_start and delete_bonds functions

The scan_start and delete_bonds functions do not need return types.
The functions have mostly been invoked without storing the return
value and the places where the return value have been used, it
is not strictly necessary. Clean this up.

Also update some logs to align with other samples.

Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>

Author: anhmolt

samples/bluetooth/ble_hrs_central/src/main.c

@@ -80,7 +80,7 @@ static uint32_t active_conn_count(atomic_t *conn)
 	return set_flag_count;
 }
 
-static uint32_t scan_start(bool erase_bonds);
+static void scan_start(bool erase_bonds);
 
 static void db_disc_handler(struct ble_db_discovery *db_discovery,
 			    struct ble_db_discovery_evt *evt)
@@ -225,7 +225,8 @@ static uint32_t peer_manager_init(void)
 
 	return NRF_SUCCESS;
 }
-static uint32_t delete_bonds(void)
+
+static void delete_bonds(void)
 {
 	uint32_t nrf_err;
 
@@ -234,18 +235,14 @@ static uint32_t delete_bonds(void)
 	nrf_err = pm_peers_delete();
 	if (nrf_err) {
 		LOG_ERR("Failed to delete bonds, nrf_error %#x", nrf_err);
-		return nrf_err;
 	}
-
-	return NRF_SUCCESS;
 }
 
 static void allow_list_disable(void)
 {
 	if (!allow_list_disabled) {
 		LOG_INF("allow list temporarily disabled");
 		allow_list_disabled = true;
-		ble_scan_stop(&ble_scan);
 		scan_start(false);
 	}
 }
@@ -467,7 +464,7 @@ static uint32_t on_allow_list_req(void)
 	return NRF_SUCCESS;
 }
 
-static uint32_t scan_start(bool erase_bonds)
+static void scan_start(bool erase_bonds)
 {
 	uint32_t nrf_err;
 
@@ -477,12 +474,9 @@ static uint32_t scan_start(bool erase_bonds)
 	} else {
 		nrf_err = ble_scan_start(&ble_scan);
 		if (nrf_err) {
-			LOG_ERR("ble_scan_start failed, nrf_error %#x", nrf_err);
-			return nrf_err;
+			LOG_ERR("Failed to start scanning, nrf_error %#x", nrf_err);
 		}
 	}
-
-	return NRF_SUCCESS;
 }
 
 static void conn_params_evt_handler(const struct ble_conn_params_evt *evt)

samples/bluetooth/ble_nus_central/src/main.c

@@ -67,7 +67,7 @@ static uint8_t uarte_rx_buf[CONFIG_SAMPLE_NUS_CENTRAL_UART_RX_BUF_SIZE][2];
 static int buf_idx;
 
 /* Forward declaration. */
-static uint32_t scan_start(void);
+static void scan_start(void);
 
 #if defined(CONFIG_SAMPLE_NUS_CENTRAL_LPUARTE)
 static void lpuarte_rx_handler(char *data, size_t data_len)
@@ -301,7 +301,7 @@ static void on_ble_scan_evt(struct ble_scan_evt const *ble_scan_evt)
 		break;
 	case BLE_SCAN_EVT_SCAN_TIMEOUT:
 		LOG_INF("Scan timed out");
-		(void)scan_start();
+		scan_start();
 		break;
 	default:
 		break;
@@ -347,7 +347,7 @@ static void on_ble_nus_client_evt(struct ble_nus_client *ble_nus_c,
 		break;
 	case BLE_NUS_CLIENT_EVT_DISCONNECTED:
 		LOG_INF("Disconnected");
-		(void)scan_start();
+		scan_start();
 		break;
 	case BLE_NUS_CLIENT_EVT_ERROR:
 		LOG_ERR("NUS error, nrf_error %#x", ble_nus_evt->error.reason);
@@ -565,16 +565,14 @@ static uint32_t db_discovery_init(void)
 	return nrf_err;
 }
 
-static uint32_t scan_start(void)
+static void scan_start(void)
 {
 	uint32_t nrf_err;
 
 	nrf_err = ble_scan_start(&ble_scan);
 	if (nrf_err) {
-		LOG_ERR("Failed to start ble_scanning, nrf_error %#x", nrf_err);
+		LOG_ERR("Failed to start scanning, nrf_error %#x", nrf_err);
 	}
-
-	return nrf_err;
 }
 
 int main(void)
@@ -638,16 +636,12 @@ int main(void)
 		goto idle;
 	}
 
-	/** Start execution.*/
-	LOG_INF("BLE NUS central example started");
-	nrf_err = scan_start();
-	if (nrf_err) {
-		goto idle;
-	}
-
 #if !defined(CONFIG_SAMPLE_NUS_CENTRAL_LPUARTE)
 	nrf_gpio_pin_write(BOARD_PIN_LED_0, BOARD_LED_ACTIVE_STATE);
 #endif
+	LOG_INF("BLE NUS Central sample initialized");
+
+	scan_start();
 
 idle:
 	/** Enter main loop.*/