Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1f2778 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

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: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0ec84d1d

drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}