Commit 717361d2 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: pcie: clean up WFPM control bits 



We define the same bit twice, remove the less precise
definition and use the better one instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230926110319.82d2744690b3.I90c08a27dca26a181dacb069184f39ece77849b5@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7186d271

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

+0 −1
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ 
#define DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK		0x00000FFF



enum {

	ENABLE_WFPM = BIT(31),

	WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK	= 0x80000000,

};

drivers/net/wireless/intel/iwlwifi/pcie/drv.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-2021 Intel Corporation

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

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -1134,7 +1134,7 @@ static int get_crf_id(struct iwl_trans *iwl_trans) 


	/* Enable access to peripheral registers */

	val = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG);

	val |= ENABLE_WFPM;

	val |= WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK;

	iwl_write_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG, val);



	/* Read crf info */