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

Commit 0c4881ce authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove unnecessary cfg element in iwl_drv 



The iwl_drv structure contains trans which already contains cfg, so
storing cfg separately in iwl_drv is redundant.  Remove it and access
trans->cfg instead.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 49060383

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+10 −12
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ static struct dentry *iwl_dbgfs_root; 
 * @op_mode: the running op_mode

 * @trans: transport layer

 * @dev: for debug prints only

 * @cfg: configuration struct

 * @fw_index: firmware revision to try loading

 * @firmware_name: composite filename of ucode file to load

 * @request_firmware_complete: the firmware has been obtained from user space
@@ -114,7 +113,6 @@ struct iwl_drv { 
	struct iwl_op_mode *op_mode;

	struct iwl_trans *trans;

	struct device *dev;

	const struct iwl_cfg *cfg;



	int fw_index;                   /* firmware we're trying to load */

	char firmware_name[64];         /* name of firmware file to load */
@@ -213,18 +211,18 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, 


static int iwl_request_firmware(struct iwl_drv *drv, bool first)

{

	const char *name_pre = drv->cfg->fw_name_pre;

	const char *name_pre = drv->trans->cfg->fw_name_pre;

	char tag[8];



	if (first) {

		drv->fw_index = drv->cfg->ucode_api_max;

		drv->fw_index = drv->trans->cfg->ucode_api_max;

		sprintf(tag, "%d", drv->fw_index);

	} else {

		drv->fw_index--;

		sprintf(tag, "%d", drv->fw_index);

	}



	if (drv->fw_index < drv->cfg->ucode_api_min) {

	if (drv->fw_index < drv->trans->cfg->ucode_api_min) {

		IWL_ERR(drv, "no suitable firmware found!\n");

		return -ENOENT;

	}
@@ -1207,7 +1205,7 @@ _iwl_op_mode_start(struct iwl_drv *drv, struct iwlwifi_opmode_table *op) 
	dbgfs_dir = drv->dbgfs_op_mode;

#endif



	op_mode = ops->start(drv->trans, drv->cfg, &drv->fw, dbgfs_dir);

	op_mode = ops->start(drv->trans, drv->trans->cfg, &drv->fw, dbgfs_dir);



#ifdef CONFIG_IWLWIFI_DEBUGFS

	if (!op_mode) {
@@ -1247,8 +1245,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	struct iwlwifi_opmode_table *op;

	int err;

	struct iwl_firmware_pieces *pieces;

	const unsigned int api_max = drv->cfg->ucode_api_max;

	const unsigned int api_min = drv->cfg->ucode_api_min;

	const unsigned int api_max = drv->trans->cfg->ucode_api_max;

	const unsigned int api_min = drv->trans->cfg->ucode_api_min;

	size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];

	u32 api_ver;

	int i;
@@ -1310,7 +1308,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	 * In mvm uCode there is no difference between data and instructions

	 * sections.

	 */

	if (fw->type == IWL_FW_DVM && validate_sec_sizes(drv, pieces, drv->cfg))

	if (fw->type == IWL_FW_DVM && validate_sec_sizes(drv, pieces,

							 drv->trans->cfg))

		goto try_again;



	/* Allocate ucode buffers for card's bus-master loading ... */
@@ -1408,14 +1407,14 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
		fw->init_evtlog_size = (pieces->init_evtlog_size - 16)/12;

	else

		fw->init_evtlog_size =

			drv->cfg->base_params->max_event_log_size;

			drv->trans->cfg->base_params->max_event_log_size;

	fw->init_errlog_ptr = pieces->init_errlog_ptr;

	fw->inst_evtlog_ptr = pieces->inst_evtlog_ptr;

	if (pieces->inst_evtlog_size)

		fw->inst_evtlog_size = (pieces->inst_evtlog_size - 16)/12;

	else

		fw->inst_evtlog_size =

			drv->cfg->base_params->max_event_log_size;

			drv->trans->cfg->base_params->max_event_log_size;

	fw->inst_errlog_ptr = pieces->inst_errlog_ptr;



	/*
@@ -1517,7 +1516,6 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) 


	drv->trans = trans;

	drv->dev = trans->dev;

	drv->cfg = trans->cfg;



	init_completion(&drv->request_firmware_complete);

	INIT_LIST_HEAD(&drv->list);