Commit 86371b73 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: remove unused macros 



Found with W=2, remove unused macros in C files. In one case
move the macro under the corresponding ifdef.

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.20220204122220.068c6052689b.Idbb7a87c2fd93619c1765c7f4ed15190c3fef2a7@changeid


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

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ 
		IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

		IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_Z_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_Z_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \

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

+0 −3
Original line number Diff line number Diff line
@@ -303,9 +303,6 @@ static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt, 
	iwl_trans_release_nic_access(fwrt->trans);

}



#define IWL8260_ICCM_OFFSET		0x44000 /* Only for B-step */

#define IWL8260_ICCM_LEN		0xC000 /* Only for B-step */



struct iwl_prph_range {

	u32 start, end;

};

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

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

/*

 * Copyright (C) 2005-2014, 2020 Intel Corporation

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

 * Copyright (C) 2016 Intel Deutschland GmbH

 */

#include <linux/slab.h>
@@ -13,8 +13,6 @@ 
#include "iwl-op-mode.h"

#include "iwl-trans.h"



#define CHANNEL_NUM_SIZE	4	/* num of channels in calib_ch size */



struct iwl_phy_db_entry {

	u16	size;

	u8	*data;

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

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#define MVM_UCODE_ALIVE_TIMEOUT	(HZ)

#define MVM_UCODE_CALIB_TIMEOUT	(2 * HZ)



#define UCODE_VALID_OK	cpu_to_le32(0x1)



#define IWL_PPAG_MASK 3

#define IWL_PPAG_ETSI_MASK BIT(0)

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

+0 −2
Original line number Diff line number Diff line
@@ -454,8 +454,6 @@ static const u16 expected_tpt_mimo2_160MHz[4][IWL_RATE_COUNT] = { 
	{0, 0, 0, 0, 971, 0, 1925, 2861, 3779, 5574, 7304, 8147, 8976, 10592, 11640},

};



#define MCS_INDEX_PER_STREAM	(8)



static const char *rs_pretty_lq_type(enum iwl_table_type type)

{

	static const char * const lq_types[] = {