Commit 73ca8763 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove card state notification code 



This notification ID was actually used for something else we
never implemented, but luckily we only had some debug code
here. Just remove 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.20211219132536.a67b5b9db259.Ic55b306fcd2a3525b3993f4b7e00622dd95053ba@changeid


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

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

+0 −9
Original line number Diff line number Diff line
@@ -157,15 +157,6 @@ enum iwl_card_state_flags { 
	CARD_IS_RX_ON		= 0x10,

};



/**

 * struct iwl_radio_version_notif - information on the card state

 * ( CARD_STATE_NOTIFICATION = 0xa1 )

 * @flags: &enum iwl_card_state_flags

 */

struct iwl_card_state_notif {

	__le32 flags;

} __packed; /* CARD_STATE_NTFY_API_S_VER_1 */



/**

 * enum iwl_error_recovery_flags - flags for error recovery cmd

 * @ERROR_RECOVERY_UPDATE_DB: update db from blob sent

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

+0 −7
Original line number Diff line number Diff line
@@ -384,13 +384,6 @@ enum iwl_legacy_cmds { 
	 */

	REDUCE_TX_POWER_CMD = 0x9f,



	/**

	 * @CARD_STATE_NOTIFICATION:

	 * Card state (RF/CT kill) notification,

	 * uses &struct iwl_card_state_notif

	 */

	CARD_STATE_NOTIFICATION = 0xa1,



	/**

	 * @MISSED_BEACONS_NOTIFICATION: &struct iwl_missed_beacons_notif

	 */

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

+0 −16
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#include "iwl-op-mode.h"

#include "fw/img.h"

#include "iwl-debug.h"

#include "iwl-csr.h" /* for iwl_mvm_rx_card_state_notif */

#include "iwl-io.h" /* for iwl_mvm_rx_card_state_notif */

#include "iwl-prph.h"

#include "fw/acpi.h"

#include "fw/pnvm.h"
@@ -1824,20 +1822,6 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm) 
	return ret;

}



void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_card_state_notif *card_state_notif = (void *)pkt->data;

	u32 flags = le32_to_cpu(card_state_notif->flags);



	IWL_DEBUG_RF_KILL(mvm, "Card state received: HW:%s SW:%s CT:%s\n",

			  (flags & HW_CARD_DISABLED) ? "Kill" : "On",

			  (flags & SW_CARD_DISABLED) ? "Kill" : "On",

			  (flags & CT_KILL_CARD_DISABLED) ?

			  "Reached" : "Not reached");

}



void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb)

{

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −2
Original line number Diff line number Diff line
@@ -1624,8 +1624,6 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb); 
void iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				   struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_shared_mem_cfg_notif(struct iwl_mvm *mvm,

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

+0 −4
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { 
		   iwl_mvm_rx_umac_scan_iter_complete_notif, RX_HANDLER_SYNC,

		   struct iwl_umac_scan_iter_complete_notif),



	RX_HANDLER(CARD_STATE_NOTIFICATION, iwl_mvm_rx_card_state_notif,

		   RX_HANDLER_SYNC, struct iwl_card_state_notif),



	RX_HANDLER(MISSED_BEACONS_NOTIFICATION, iwl_mvm_rx_missed_beacons_notif,

		   RX_HANDLER_SYNC, struct iwl_missed_beacons_notif),
@@ -454,7 +451,6 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = { 
	HCMD_NAME(STATISTICS_NOTIFICATION),

	HCMD_NAME(EOSP_NOTIFICATION),

	HCMD_NAME(REDUCE_TX_POWER_CMD),

	HCMD_NAME(CARD_STATE_NOTIFICATION),

	HCMD_NAME(MISSED_BEACONS_NOTIFICATION),

	HCMD_NAME(TDLS_CONFIG_CMD),

	HCMD_NAME(MAC_PM_POWER_TABLE),