iwlwifi: move ucode notification from iwl_priv to iwl_shared

Move the notification structures for ucode operations from the
iwl_priv structure to the iwl_shared structure, with associated
code changes.

Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 00b38711c15d..466e4ab544f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -60,7 +60,7 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         u8 old_dev_type = send->dev_type;
         int ret;
 
-        iwlagn_init_notification_wait(priv, &disable_wait,
+        iwl_init_notification_wait(priv->shrd, &disable_wait,
                                       REPLY_WIPAN_DEACTIVATION_COMPLETE,
                                       NULL, NULL);
 
@@ -74,9 +74,9 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
 
         if (ret) {
                 IWL_ERR(priv, "Error disabling PAN (%d)\n", ret);
-                iwlagn_remove_notification(priv, &disable_wait);
+                iwl_remove_notification(priv->shrd, &disable_wait);
         } else {
-                ret = iwlagn_wait_notification(priv, &disable_wait, HZ);
+                ret = iwl_wait_notification(priv->shrd, &disable_wait, HZ);
                 if (ret)
                         IWL_ERR(priv, "Timed out waiting for PAN disable\n");
         }