diff options
author | Sara Sharon <sara.sharon@intel.com> | 2016-04-10 09:02:12 -0400 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2016-05-10 15:34:03 -0400 |
commit | ce1f27787d493bc28d2f523a3b4c9f72aa9cee7d (patch) | |
tree | ab64f56538f9c51659d219a814f5f1ae5c9ebf8a /drivers/net/wireless/intel | |
parent | 0ec84d1d1e6db6e0b4c1eb9bd9cdd2da64451da6 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/intel')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c index ecfa491fa68f..7beba9ae5617 100644 --- 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) | |||
221 | } | 221 | } |
222 | IWL_EXPORT_SYMBOL(iwl_phy_db_free); | 222 | IWL_EXPORT_SYMBOL(iwl_phy_db_free); |
223 | 223 | ||
224 | int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt, | 224 | int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, |
225 | gfp_t alloc_ctx) | 225 | struct iwl_rx_packet *pkt) |
226 | { | 226 | { |
227 | struct iwl_calib_res_notif_phy_db *phy_db_notif = | 227 | struct iwl_calib_res_notif_phy_db *phy_db_notif = |
228 | (struct iwl_calib_res_notif_phy_db *)pkt->data; | 228 | (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, | |||
269 | return -EINVAL; | 269 | return -EINVAL; |
270 | 270 | ||
271 | kfree(entry->data); | 271 | kfree(entry->data); |
272 | entry->data = kmemdup(phy_db_notif->data, size, alloc_ctx); | 272 | entry->data = kmemdup(phy_db_notif->data, size, GFP_ATOMIC); |
273 | if (!entry->data) { | 273 | if (!entry->data) { |
274 | entry->size = 0; | 274 | entry->size = 0; |
275 | return -ENOMEM; | 275 | 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 24103877eab0..d34de3f71db6 100644 --- 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); | |||
73 | 73 | ||
74 | void iwl_phy_db_free(struct iwl_phy_db *phy_db); | 74 | void iwl_phy_db_free(struct iwl_phy_db *phy_db); |
75 | 75 | ||
76 | int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt, | 76 | int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, |
77 | gfp_t alloc_ctx); | 77 | struct iwl_rx_packet *pkt); |
78 | 78 | ||
79 | 79 | ||
80 | int iwl_send_phy_db_data(struct iwl_phy_db *phy_db); | 80 | 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 b70f4530f960..7057f35cb2e7 100644 --- 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, | |||
535 | return true; | 535 | return true; |
536 | } | 536 | } |
537 | 537 | ||
538 | WARN_ON(iwl_phy_db_set_section(phy_db, pkt, GFP_ATOMIC)); | 538 | WARN_ON(iwl_phy_db_set_section(phy_db, pkt)); |
539 | 539 | ||
540 | return false; | 540 | return false; |
541 | } | 541 | } |