Commit 3681021f authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo
Browse files

iwlwifi: remove IWL_DEVICE_22560/IWL_DEVICE_FAMILY_22560 



This is dead code, nothing uses the IWL_DEVICE_22560 macro and
thus nothing every uses IWL_DEVICE_FAMILY_22560. Remove it all.

While at it, remove some code and definitions used only in this
case, and clean up some comments/names that still refer to it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4658d552

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

+2 −18
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static const struct iwl_base_params iwl_22000_base_params = { 
	.pcie_l1_allowed = true,

};



static const struct iwl_base_params iwl_22560_base_params = {

static const struct iwl_base_params iwl_ax210_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,
@@ -212,27 +212,11 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



#define IWL_DEVICE_22560						\

	IWL_DEVICE_22000_COMMON,					\

	.trans.device_family = IWL_DEVICE_FAMILY_22560,			\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.csr = &iwl_csr_v2,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = MON_BUFF_WRPTR_VER2,			\

			.mask = 0xffffffff,				\

		},							\

		.cycle_cnt = {						\

			.addr = MON_BUFF_CYCLE_CNT_VER2,		\

			.mask = 0xffffffff,				\

		},							\

	}



#define IWL_DEVICE_AX210						\

	IWL_DEVICE_22000_COMMON,					\

	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.base_params = &iwl_ax210_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -323,7 +323,7 @@ struct iwl_tx_cmd_gen2 { 
} __packed; /* TX_CMD_API_S_VER_7 */



/**

 * struct iwl_tx_cmd_gen3 - TX command struct to FW for 22560 devices

 * struct iwl_tx_cmd_gen3 - TX command struct to FW for AX210+ devices

 * ( TX_CMD = 0x1c )

 * @len: in bytes of the payload, see below for details

 * @flags: combination of &enum iwl_tx_cmd_flags

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

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ enum iwl_device_family { 
	IWL_DEVICE_FAMILY_8000,

	IWL_DEVICE_FAMILY_9000,

	IWL_DEVICE_FAMILY_22000,

	IWL_DEVICE_FAMILY_22560,

	IWL_DEVICE_FAMILY_AX210,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -603,9 +603,7 @@ enum msix_fh_int_causes { 
enum msix_hw_int_causes {

	MSIX_HW_INT_CAUSES_REG_ALIVE		= BIT(0),

	MSIX_HW_INT_CAUSES_REG_WAKEUP		= BIT(1),

	MSIX_HW_INT_CAUSES_REG_IPC		= BIT(1),

	MSIX_HW_INT_CAUSES_REG_IML              = BIT(2),

	MSIX_HW_INT_CAUSES_REG_SW_ERR_V2	= BIT(5),

	MSIX_HW_INT_CAUSES_REG_CT_KILL		= BIT(6),

	MSIX_HW_INT_CAUSES_REG_RF_KILL		= BIT(7),

	MSIX_HW_INT_CAUSES_REG_PERIODIC		= BIT(8),

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

+1 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ MODULE_PARM_DESC(11n_disable, 
	"disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX");

module_param_named(amsdu_size, iwlwifi_mod_params.amsdu_size, int, 0444);

MODULE_PARM_DESC(amsdu_size,

		 "amsdu size 0: 12K for multi Rx queue devices, 2K for 22560 devices, "

		 "amsdu size 0: 12K for multi Rx queue devices, 2K for AX210 devices, "

		 "4K for other devices 1:4K 2:8K 3:12K 4: 2K (default 0)");

module_param_named(fw_restart, iwlwifi_mod_params.fw_restart, bool, 0444);

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");

CRA Git | Maintained and supported by SUSTech CRA and CCSE