From 4f2210ee8498faa3499a927f0a40027ff972ec3a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 1 Jun 2017 11:37:25 +0200 Subject: iwlwifi: mvm: remove version 2 of paging command Only a000-series devices were going to use this, but actually initialize using the context info, which includes paging, so this code is never invoked; remove it. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h') diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h index f3ca61ff9f58..3e297c95e8ff 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h @@ -326,7 +326,7 @@ enum iwl_legacy_cmds { /** * @FW_PAGING_BLOCK_CMD: - * &struct iwl_fw_paging_cmd or &struct iwl_fw_paging_cmd_v1 + * &struct iwl_fw_paging_cmd */ FW_PAGING_BLOCK_CMD = 0x4f, @@ -998,25 +998,6 @@ struct iwl_nvm_access_cmd { #define NUM_OF_FW_PAGING_BLOCKS 33 /* 32 for data and 1 block for CSS */ -/** - * struct iwl_fw_paging_cmd_v1 - paging layout - * - * (FW_PAGING_BLOCK_CMD = 0x4f) - * - * Send to FW the paging layout in the driver. - * - * @flags: various flags for the command - * @block_size: the block size in powers of 2 - * @block_num: number of blocks specified in the command. - * @device_phy_addr: virtual addresses from device side - */ -struct iwl_fw_paging_cmd_v1 { - __le32 flags; - __le32 block_size; - __le32 block_num; - __le32 device_phy_addr[NUM_OF_FW_PAGING_BLOCKS]; -} __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_1 */ - /** * struct iwl_fw_paging_cmd - paging layout * @@ -1033,8 +1014,8 @@ struct iwl_fw_paging_cmd { __le32 flags; __le32 block_size; __le32 block_num; - __le64 device_phy_addr[NUM_OF_FW_PAGING_BLOCKS]; -} __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_2 */ + __le32 device_phy_addr[NUM_OF_FW_PAGING_BLOCKS]; +} __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_1 */ /* * Fw items ID's -- cgit