iwlwifi: use iwl_poll_direct_bit in EEPROM reading

The patch replaces the current reading EEPROM loop iterations with
iwl_poll_direct_bit(). It also fixes some comment error.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 14 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index a47fa38e52f0..ce2f47306cea 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -209,10 +209,8 @@ int iwl_eeprom_init(struct iwl_priv *priv)
 {
         u16 *e;
         u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
-        u32 r;
         int sz = priv->cfg->eeprom_size;
         int ret;
-        int i;
         u16 addr;
 
         /* allocate eeprom */
@@ -240,22 +238,19 @@ int iwl_eeprom_init(struct iwl_priv *priv)
 
         /* eeprom is an array of 16bit values */
         for (addr = 0; addr < sz; addr += sizeof(u16)) {
-                _iwl_write32(priv, CSR_EEPROM_REG, addr << 1);
-                _iwl_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);
-
-                for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;
-                                        i += IWL_EEPROM_ACCESS_DELAY) {
-                        r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
-                        if (r & CSR_EEPROM_REG_READ_VALID_MSK)
-                                break;
-                        udelay(IWL_EEPROM_ACCESS_DELAY);
-                }
+                u32 r;
+
+                _iwl_write32(priv, CSR_EEPROM_REG,
+                             CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
 
-                if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
+                ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,
+                                          CSR_EEPROM_REG_READ_VALID_MSK,
+                                          IWL_EEPROM_ACCESS_TIMEOUT);
+                if (ret < 0) {
                         IWL_ERROR("Time out reading EEPROM[%d]\n", addr);
-                        ret = -ETIMEDOUT;
                         goto done;
                 }
+                r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
                 e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
         }
         ret = 0;