1 files changed, 2 insertions, 22 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index 5c9c88b8609..f17142bb5df 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -1142,9 +1142,7 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)
         priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;
 
         /* set up notification wait support */
-        spin_lock_init(&priv->shrd->notif_wait_lock);
-        INIT_LIST_HEAD(&priv->shrd->notif_waits);
-        init_waitqueue_head(&priv->shrd->notif_waitq);
+        iwl_notification_wait_init(&priv->notif_wait);
 
         /* Set up BT Rx handlers */
         if (cfg(priv)->lib->bt_rx_handler_setup)
@@ -1164,25 +1162,7 @@ int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
          * even if the RX handler consumes the RXB we have
          * access to it in the notification wait entry.
          */
-        if (!list_empty(&priv->shrd->notif_waits)) {
-                struct iwl_notification_wait *w;
-
-                spin_lock(&priv->shrd->notif_wait_lock);
-                list_for_each_entry(w, &priv->shrd->notif_waits, list) {
-                        if (w->cmd != pkt->hdr.cmd)
-                                continue;
-                        IWL_DEBUG_RX(priv,
-                                "Notif: %s, 0x%02x - wake the callers up\n",
-                                get_cmd_string(pkt->hdr.cmd),
-                                pkt->hdr.cmd);
-                        w->triggered = true;
-                        if (w->fn)
-                                w->fn(priv, pkt, w->fn_data);
-                }
-                spin_unlock(&priv->shrd->notif_wait_lock);
-
-                wake_up_all(&priv->shrd->notif_waitq);
-        }
+        iwl_notification_wait_notify(&priv->notif_wait, pkt);
 
         if (priv->pre_rx_handler &&
             priv->shrd->ucode_owner == IWL_OWNERSHIP_TM)