wifi: iwlwifi: simplify iwl_poll_bits_mask return value

Update iwl_poll_bits_mask to return 0 on success or an error code.
Remove timing information from the return value, as it is unused.

Signed-off-by: Itamar Shalev <itamar.shalev@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250709230308.f77b9f484a78.Iae8ef99a94e25c23044e2c36244cda2b55328447@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
index 8087aee03d1c018da7be01908909d4b3ecf06f6f..9f8cdb027839a6d55bc5d0b2c2d3e7b6ee5b521a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
@@ -679,11 +679,11 @@ static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
                ret = iwl_poll_bits(trans, CSR_HW_IF_CONFIG_REG,
                                    CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM,
                                    IWL_EEPROM_SEM_TIMEOUT);
-               if (ret >= 0) {
+               if (!ret) {
                        IWL_DEBUG_EEPROM(trans->dev,
                                         "Acquired semaphore after %d tries.\n",
                                         count+1);
-                       return ret;
+                       return 0;
                }
        }
 
@@ -799,7 +799,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
        ret = iwl_poll_bits(trans, CSR_EEPROM_REG,
                            CSR_EEPROM_REG_READ_VALID_MSK,
                            IWL_EEPROM_ACCESS_TIMEOUT);
-       if (ret < 0) {
+       if (ret) {
                IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
                return ret;
        }
@@ -941,14 +941,14 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
                return -ENOMEM;
 
        ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);
-       if (ret < 0) {
+       if (ret) {
                IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
                goto err_free;
        }
 
        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
        ret = iwl_eeprom_acquire_semaphore(trans);
-       if (ret < 0) {
+       if (ret) {
                IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");
                goto err_free;
        }
@@ -994,7 +994,7 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
                        ret = iwl_poll_bits(trans, CSR_EEPROM_REG,
                                            CSR_EEPROM_REG_READ_VALID_MSK,
                                            IWL_EEPROM_ACCESS_TIMEOUT);
-                       if (ret < 0) {
+                       if (ret) {
                                IWL_ERR(trans,
                                        "Time out reading EEPROM[%d]\n", addr);
                                goto err_unlock;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index 47ad447b622652a8f210ccd7ce6edb88dd28876a..ad857a05d3c3b5fe533cc8824ff84592694ae5f8 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -54,7 +54,7 @@ int iwl_poll_bits_mask(struct iwl_trans *trans, u32 addr,
 
        do {
                if ((iwl_read32(trans, addr) & mask) == (bits & mask))
-                       return t;
+                       return 0;
                udelay(IWL_POLL_INTERVAL);
                t += IWL_POLL_INTERVAL;
        } while (t < timeout);

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
index 585d845b53faf78f68c14e16b5fee1c82a20aa4b..327366bf87de78a5d4c16d8e228b7fa74f0e94d6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -392,7 +392,7 @@ void iwl_pcie_apm_stop_master(struct iwl_trans *trans)
                                    CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
        }
 
-       if (ret < 0)
+       if (ret)
                IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");
 
        IWL_DEBUG_INFO(trans, "stop master\n");
@@ -495,10 +495,10 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)
                            CSR_HW_IF_CONFIG_REG_PCI_OWN_SET,
                            HW_READY_TIMEOUT);
 
-       if (ret >= 0)
+       if (!ret)
                iwl_set_bit(trans, CSR_MBOX_SET_REG, CSR_MBOX_SET_REG_OS_ALIVE);
 
-       IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret < 0 ? " not" : "");
+       IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret ? " not" : "");
        return ret;
 }
 
@@ -512,7 +512,7 @@ int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)
 
        ret = iwl_pcie_set_hw_ready(trans);
        /* If the card is ready, exit 0 */
-       if (ret >= 0) {
+       if (!ret) {
                trans->csme_own = false;
                return 0;
        }
@@ -530,7 +530,7 @@ int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)
 
                do {
                        ret = iwl_pcie_set_hw_ready(trans);
-                       if (ret >= 0) {
+                       if (!ret) {
                                trans->csme_own = false;
                                return 0;
                        }
@@ -2353,7 +2353,7 @@ bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent)
         * and do not save/restore SRAM when power cycling.
         */
        ret = iwl_poll_bits_mask(trans, CSR_GP_CNTRL, poll, mask, 15000);
-       if (unlikely(ret < 0)) {
+       if (unlikely(ret)) {
                u32 cntrl = iwl_read32(trans, CSR_GP_CNTRL);
 
                if (silent) {

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
index 3af6e3b3640d648b4b522de1a0e3733850b90ac2..224f4a68c7a8d8e4f1f90cc06af529ae81ccfd91 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
@@ -591,7 +591,7 @@ static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)
 
        /* Wait for DMA channels to be idle */
        ret = iwl_poll_bits(trans, FH_TSSR_TX_STATUS_REG, mask, 5000);
-       if (ret < 0)
+       if (ret)
                IWL_ERR(trans,
                        "Failing on timeout while stopping DMA channel %d [0x%08x]\n",
                        ch, iwl_read32(trans, FH_TSSR_TX_STATUS_REG));