iwlwifi: mvm: remove redundant alloc_ctx parameter

iwl_phy_db_set_section() is get called only from atomic
context, the alloc_ctx parameter is not needed. Remove it.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
index ecfa491fa68f8f190f1a6406107f93359d1d0dae..7beba9ae56176a821e7b5f7f49ea7022dcabc303 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
@@ -221,8 +221,8 @@ void iwl_phy_db_free(struct iwl_phy_db *phy_db)
 }
 IWL_EXPORT_SYMBOL(iwl_phy_db_free);
 
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
-                          gfp_t alloc_ctx)
+int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
+                          struct iwl_rx_packet *pkt)
 {
        struct iwl_calib_res_notif_phy_db *phy_db_notif =
                        (struct iwl_calib_res_notif_phy_db *)pkt->data;
@@ -269,7 +269,7 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
                return -EINVAL;
 
        kfree(entry->data);
-       entry->data = kmemdup(phy_db_notif->data, size, alloc_ctx);
+       entry->data = kmemdup(phy_db_notif->data, size, GFP_ATOMIC);
        if (!entry->data) {
                entry->size = 0;
                return -ENOMEM;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h
index 24103877eab05d85697c41dc10b11e86d4b47ce4..d34de3f71db60d26235e859b70884cf6688fb0a6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h
@@ -73,8 +73,8 @@ struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans);
 
 void iwl_phy_db_free(struct iwl_phy_db *phy_db);
 
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
-                          gfp_t alloc_ctx);
+int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
+                          struct iwl_rx_packet *pkt);
 
 
 int iwl_send_phy_db_data(struct iwl_phy_db *phy_db);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index b70f4530f9602ed50869fef38f381ded6e59f5bb..7057f35cb2e76703c9f8810b9bbdc10f0a2bee9f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -535,7 +535,7 @@ static bool iwl_wait_phy_db_entry(struct iwl_notif_wait_data *notif_wait,
                return true;
        }
 
-       WARN_ON(iwl_phy_db_set_section(phy_db, pkt, GFP_ATOMIC));
+       WARN_ON(iwl_phy_db_set_section(phy_db, pkt));
 
        return false;
 }