bluetooth: services: ble_bas: return errors from SoftDevice directly

Return erros from SoftDevice directly.

Signed-off-by: Emanuele Di Santo <[email protected]>

Author: lemrey

include/bm/bluetooth/services/ble_bas.h

@@ -179,7 +179,10 @@ struct ble_bas {
  *
  * @retval NRF_SUCCESS On success.
  * @retval NRF_ERROR_NULL If @p bas or @p bas_config are @c NULL.
- * @retval NRF_ERROR_INVALID_PARAM Invalid parameters.
+ * @return This function additionally may return an error from these SoftDevice functions:
+ *	   - @ref sd_ble_gatts_service_add(),
+ *	   - @ref sd_ble_gatts_characteristic_add(),
+ *	   - @ref sd_ble_gatts_descriptor_add().
  */
 uint32_t ble_bas_init(struct ble_bas *bas, const struct ble_bas_config *bas_config);
 

subsys/bluetooth/services/ble_bas/bas.c

@@ -144,14 +144,14 @@ uint32_t ble_bas_init(struct ble_bas *bas, const struct ble_bas_config *cfg)
 					   &bas->service_handle);
 	if (nrf_err) {
 		LOG_ERR("Failed to add battery service, nrf_error %#x", nrf_err);
-		return NRF_ERROR_INVALID_PARAM;
+		return nrf_err;
 	}
 
 	/* Add battery level characteristic */
 	nrf_err =  battery_level_char_add(bas, cfg);
 	if (nrf_err) {
 		LOG_ERR("Failed to add battery service characteristic, nrf_error %#x", nrf_err);
-		return NRF_ERROR_INVALID_PARAM;
+		return nrf_err;
 	}
 
 	/* Add reference descriptor if present */
@@ -160,7 +160,7 @@ uint32_t ble_bas_init(struct ble_bas *bas, const struct ble_bas_config *cfg)
 		if (nrf_err) {
 			LOG_ERR("Failed to add report reference descriptor, nrf_error %#x",
 				nrf_err);
-			return NRF_ERROR_INVALID_PARAM;
+			return nrf_err;
 		}
 	}