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

Commit bdfbf092 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: provide heplers to access the transport ops 



This removes the for priv->trans.ops->...

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02f6f659

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "iwl-agn.h"

#include "iwl-agn-hw.h"

#include "iwl-5000-hw.h"

#include "iwl-trans.h"



/* Highest firmware API version supported */

#define IWL5000_UCODE_API_MAX 5
@@ -314,7 +315,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 
		return -EFAULT;

	}



	return priv->trans.ops->send_cmd(priv, &hcmd);

	return trans_send_cmd(priv, &hcmd);

}



static struct iwl_lib_ops iwl5000_lib = {

drivers/net/wireless/iwlwifi/iwl-6000.c

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-trans.h"



/* Highest firmware API version supported */

#define IWL6000_UCODE_API_MAX 4
@@ -254,7 +255,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 
		return -EFAULT;

	}



	return priv->trans.ops->send_cmd(priv, &hcmd);

	return trans_send_cmd(priv, &hcmd);

}



static struct iwl_lib_ops iwl6000_lib = {

drivers/net/wireless/iwlwifi/iwl-agn-calib.c

+4 −3
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-agn-calib.h"

#include "iwl-trans.h"



/*****************************************************************************

 * INIT calibrations framework
@@ -96,7 +97,7 @@ int iwl_send_calib_results(struct iwl_priv *priv) 
			hcmd.len[0] = priv->calib_results[i].buf_len;

			hcmd.data[0] = priv->calib_results[i].buf;

			hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;

			ret = priv->trans.ops->send_cmd(priv, &hcmd);

			ret = trans_send_cmd(priv, &hcmd);

			if (ret) {

				IWL_ERR(priv, "Error %d iteration %d\n",

					ret, i);
@@ -482,7 +483,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv) 
	memcpy(&(priv->sensitivity_tbl[0]), &(cmd.table[0]),

	       sizeof(u16)*HD_TABLE_SIZE);



	return priv->trans.ops->send_cmd(priv, &cmd_out);

	return trans_send_cmd(priv, &cmd_out);

}



/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
@@ -546,7 +547,7 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv) 
	       &(cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX]),

	       sizeof(u16)*ENHANCE_HD_TABLE_ENTRIES);



	return priv->trans.ops->send_cmd(priv, &cmd_out);

	return trans_send_cmd(priv, &cmd_out);

}



void iwl_init_sensitivity(struct iwl_priv *priv)

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+5 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-agn.h"

#include "iwl-trans.h"



int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)

{
@@ -45,7 +46,7 @@ int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) 


	if (IWL_UCODE_API(priv->ucode_ver) > 1) {

		IWL_DEBUG_HC(priv, "select valid tx ant: %u\n", valid_tx_ant);

		return priv->trans.ops->send_cmd_pdu(priv,

		return trans_send_cmd_pdu(priv,

					TX_ANT_CONFIGURATION_CMD,

					CMD_SYNC,

					sizeof(struct iwl_tx_ant_config_cmd),
@@ -117,7 +118,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, 
			priv->_agn.phy_calib_chain_noise_gain_cmd);

		cmd.delta_gain_1 = data->delta_gain_code[1];

		cmd.delta_gain_2 = data->delta_gain_code[2];

		priv->trans.ops->send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,

		trans_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,

			CMD_ASYNC, sizeof(cmd), &cmd);



		data->radio_write = 1;
@@ -146,7 +147,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) 
		memset(&cmd, 0, sizeof(cmd));

		iwl_set_calib_hdr(&cmd.hdr,

			priv->_agn.phy_calib_chain_noise_reset_cmd);

		ret = priv->trans.ops->send_cmd_pdu(priv,

		ret = trans_send_cmd_pdu(priv,

					REPLY_PHY_CALIBRATION_CMD,

					CMD_SYNC, sizeof(cmd), &cmd);

		if (ret)
@@ -293,7 +294,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv) 
	cmd.slots[0].width = cpu_to_le16(slot0);

	cmd.slots[1].width = cpu_to_le16(slot1);



	ret = priv->trans.ops->send_cmd_pdu(priv, REPLY_WIPAN_PARAMS, CMD_SYNC,

	ret = trans_send_cmd_pdu(priv, REPLY_WIPAN_PARAMS, CMD_SYNC,

			sizeof(cmd), &cmd);

	if (ret)

		IWL_ERR(priv, "Error setting PAN parameters (%d)\n", ret);

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+10 −9
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "iwl-agn-hw.h"

#include "iwl-agn.h"

#include "iwl-sta.h"

#include "iwl-trans.h"



static inline u32 iwlagn_get_scd_ssn(struct iwlagn_tx_resp *tx_resp)

{
@@ -540,7 +541,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv) 
	else

		tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD;



	return priv->trans.ops->send_cmd_pdu(priv, tx_ant_cfg_cmd, CMD_SYNC,

	return trans_send_cmd_pdu(priv, tx_ant_cfg_cmd, CMD_SYNC,

			sizeof(tx_power_cmd), &tx_power_cmd);

}
@@ -714,7 +715,7 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
	priv->cfg->ops->lib->apm_ops.config(priv);



	/* Allocate the RX queue, or reset if it is already allocated */

	priv->trans.ops->rx_init(priv);

	trans_rx_init(priv);



	iwlagn_rx_replenish(priv);
@@ -728,7 +729,7 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
	spin_unlock_irqrestore(&priv->lock, flags);



	/* Allocate or reset and init all Tx and Command queues */

	if (priv->trans.ops->tx_init(priv))

	if (trans_tx_init(priv))

		return -ENOMEM;



	if (priv->cfg->base_params->shadow_reg_enable) {
@@ -1360,7 +1361,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	if (ret)

		return ret;



	ret = priv->trans.ops->send_cmd(priv, &cmd);

	ret = trans_send_cmd(priv, &cmd);

	if (ret) {

		clear_bit(STATUS_SCAN_HW, &priv->status);

		iwlagn_set_pan_params(priv);
@@ -1466,7 +1467,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control) 
		       flush_cmd.fifo_control);

	flush_cmd.flush_control = cpu_to_le16(flush_control);



	return priv->trans.ops->send_cmd(priv, &cmd);

	return trans_send_cmd(priv, &cmd);

}



void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
@@ -1658,12 +1659,12 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) 
	if (priv->cfg->bt_params->bt_session_2) {

		memcpy(&bt_cmd_2000.basic, &basic,

			sizeof(basic));

		ret = priv->trans.ops->send_cmd_pdu(priv, REPLY_BT_CONFIG,

		ret = trans_send_cmd_pdu(priv, REPLY_BT_CONFIG,

			CMD_SYNC, sizeof(bt_cmd_2000), &bt_cmd_2000);

	} else {

		memcpy(&bt_cmd_6000.basic, &basic,

			sizeof(basic));

		ret = priv->trans.ops->send_cmd_pdu(priv, REPLY_BT_CONFIG,

		ret = trans_send_cmd_pdu(priv, REPLY_BT_CONFIG,

			CMD_SYNC, sizeof(bt_cmd_6000), &bt_cmd_6000);

	}

	if (ret)
@@ -2311,8 +2312,8 @@ void iwlagn_stop_device(struct iwl_priv *priv) 
	 * already dead.

	 */

	if (test_bit(STATUS_DEVICE_ENABLED, &priv->status)) {

		priv->trans.ops->tx_stop(priv);

		priv->trans.ops->rx_stop(priv);

		trans_tx_stop(priv);

		trans_rx_stop(priv);



		/* Power-down device's busmaster DMA clocks */

		iwl_write_prph(priv, APMG_CLK_DIS_REG,