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

Commit ff6e75cb authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: remove a few dereferences to iwl_priv from the tansport 



The transport should not dereference the iwl_priv pointer. Remove a
few of those.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent bcb9321c

drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c

+3 −4
Original line number Diff line number Diff line
@@ -671,9 +671,8 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans) 
 */

static void iwl_irq_handle_error(struct iwl_trans *trans)

{

	struct iwl_priv *priv = priv(trans);

	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */

	if (cfg(priv)->internal_wimax_coex &&

	if (cfg(trans)->internal_wimax_coex &&

	    (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &

			APMS_CLK_VAL_MRB_FUNC_MODE) ||

	     (iwl_read_prph(trans, APMG_PS_CTRL_REG) &
@@ -684,13 +683,13 @@ static void iwl_irq_handle_error(struct iwl_trans *trans) 
		 */

		clear_bit(STATUS_READY, &trans->shrd->status);

		clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);

		wake_up(&priv->shrd->wait_command_queue);

		wake_up(&trans->shrd->wait_command_queue);

		IWL_ERR(trans, "RF is used by WiMAX\n");

		return;

	}



	IWL_ERR(trans, "Loaded firmware version: %s\n",

		priv->hw->wiphy->fw_version);

		nic(trans)->fw.fw_version);



	iwl_dump_nic_error_log(trans);

	iwl_dump_csr(trans);