Combine ble_gap_preempt() and ble_gap_ensure_preempted()

nimble/host/src/ble_gap.c

@@ -4673,6 +4673,8 @@ ble_gap_preempt_no_lock(void)
 }
 
 /**
+ * @brief Preempts the GAP if it is not already preempted.
+ *
  * Aborts all active GAP procedures and prevents new ones from being started.
  * This function is used to ensure an idle GAP so that the controller's
  * resolving list can be modified.  When done accessing the resolving list, the
@@ -4687,20 +4689,6 @@ ble_gap_preempt(void)
 {
     ble_hs_lock();
 
-    BLE_HS_DBG_ASSERT(!ble_gap_is_preempted());
-    ble_gap_preempt_no_lock();
-
-    ble_hs_unlock();
-}
-
-/**
- * Preempts the GAP if it is not already preempted.
- */
-void
-ble_gap_ensure_preempted(void)
-{
-    ble_hs_lock();
-
     if (!ble_gap_is_preempted()) {
         ble_gap_preempt_no_lock();
     }

nimble/host/src/ble_gap_priv.h

@@ -110,7 +110,6 @@ int ble_gap_repeat_pairing_event(const struct ble_gap_repeat_pairing *rp);
 int ble_gap_master_in_progress(void);
 
 void ble_gap_preempt(void);
-void ble_gap_ensure_preempted(void);
 void ble_gap_preempt_done(void);
 
 void ble_gap_conn_broken(uint16_t conn_handle, int reason);

nimble/host/src/ble_hs_stop.c

@@ -193,7 +193,7 @@ ble_hs_stop(struct ble_hs_stop_listener *listener,
     }
 
     /* Abort all active GAP procedures. */
-    ble_gap_ensure_preempted();
+    ble_gap_preempt();
     ble_gap_preempt_done();
 
     rc = ble_gap_event_listener_register(&ble_hs_stop_gap_listener,