[BUGFIX] wifi: iwlwifi: convert iwl_poll_bits() to a static inline
This reduces overhead and improves performance for callers.
type=bugfix
ticket=none
fixes=Ic7a10a7f8a9a32a9a9feecaf6e3a48fa37479f2d
Signed-off-by: Rotem Kerem <rotem.kerem@intel.com>
Change-Id: I7ea7d08d0487ed68d3c50e5350dae4680a6e68aa
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/201663
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 459bf966b5cd710753b9d64d51145cd730f15b46
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index 46dc0ab..a829f0c 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -63,12 +63,6 @@
}
IWL_EXPORT_SYMBOL(iwl_poll_bits_mask);
-int iwl_poll_bits(struct iwl_trans *trans, u32 addr, u32 mask, int timeout)
-{
- return iwl_poll_bits_mask(trans, addr, mask, mask, timeout);
-}
-IWL_EXPORT_SYMBOL(iwl_poll_bits);
-
u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
{
if (iwl_trans_grab_nic_access(trans)) {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
index d866cfd..731cda1 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
@@ -25,7 +25,11 @@
int iwl_poll_bits_mask(struct iwl_trans *trans, u32 addr,
u32 bits, u32 mask, int timeout);
-int iwl_poll_bits(struct iwl_trans *trans, u32 addr, u32 bit, int timeout);
+static inline int iwl_poll_bits(struct iwl_trans *trans, u32 addr, u32 bits,
+ int timeout)
+{
+ return iwl_poll_bits_mask(trans, addr, bits, bits, timeout);
+}
int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
int timeout);
diff --git a/versions b/versions
index 9a74b2b..f460ec5 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:13856:9539694f"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:13857:459bf966"
