Commit 425d66d8 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: remove redundant iwl_finish_nic_init() argument 



We don't need this argument, since in all cases where the
function is called, trans->trans_cfg is already set (it's
in fact set during allocation). Remove it to avoid any
confusion about it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211017162352.cb04580b8521.I7129d4ba3dc689af839761d5807a10f99718893e@changeid


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

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

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void iwl_fwrt_dump_lmac_error_log(struct iwl_fw_runtime *fwrt, u8 lmac_nu 
		/* reset the device */

		iwl_trans_sw_reset(trans);



		err = iwl_finish_nic_init(trans, trans->trans_cfg);

		err = iwl_finish_nic_init(trans);

		if (err)

			return;

	}

drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2005-2014, 2018-2019 Intel Corporation

 * Copyright (C) 2005-2014, 2018-2019, 2021 Intel Corporation

 */

#include <linux/types.h>

#include <linux/slab.h>
@@ -139,7 +139,7 @@ static int iwl_init_otp_access(struct iwl_trans *trans) 
{

	int ret;



	ret = iwl_finish_nic_init(trans, trans->trans_cfg);

	ret = iwl_finish_nic_init(trans);

	if (ret)

		return ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -398,9 +398,9 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf) 
	return 0;

}



int iwl_finish_nic_init(struct iwl_trans *trans,

			const struct iwl_cfg_trans_params *cfg_trans)

int iwl_finish_nic_init(struct iwl_trans *trans)

{

	const struct iwl_cfg_trans_params *cfg_trans = trans->trans_cfg;

	u32 poll_ready;

	int err;

drivers/net/wireless/intel/iwlwifi/iwl-io.h

+2 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */

#ifndef __iwl_io_h__

#define __iwl_io_h__
@@ -52,8 +52,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, 
void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);

void iwl_force_nmi(struct iwl_trans *trans);



int iwl_finish_nic_init(struct iwl_trans *trans,

			const struct iwl_cfg_trans_params *cfg_trans);

int iwl_finish_nic_init(struct iwl_trans *trans);



/* Error handling */

int iwl_dump_fh(struct iwl_trans *trans, char **buf);

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans) 


	iwl_pcie_apm_config(trans);



	ret = iwl_finish_nic_init(trans, trans->trans_cfg);

	ret = iwl_finish_nic_init(trans);

	if (ret)

		return ret;