iwmc3200wifi: remove B0 hardware support

[~andy/linux] / drivers / net / wireless / iwmc3200wifi / fw.c

diff --git a/drivers/net/wireless/iwmc3200wifi/fw.c b/drivers/net/wireless/iwmc3200wifi/fw.c
index db4ba08647306891463f806d7b51882d2f98eba8..0f32cab9ced4daab9f418929dd2225eb89b98f12 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/fw.c
+++ b/drivers/net/wireless/iwmc3200wifi/fw.c
@@ -72,7 +72,7 @@ static int iwm_fw_op_offset(struct iwm_priv *iwm, const struct firmware *fw,
        }
 
        if (fw->size < IWM_HDR_LEN) {
-               IWM_ERR(iwm, "FW is too small (%d)\n", fw->size);
+               IWM_ERR(iwm, "FW is too small (%zu)\n", fw->size);
                return -EINVAL;
        }
 
@@ -275,6 +275,7 @@ static int iwm_load_lmac(struct iwm_priv *iwm, const char *img_name)
  */
 int iwm_load_fw(struct iwm_priv *iwm)
 {
+       unsigned long init_calib_map, periodic_calib_map;
        int ret;
 
        /* We first start downloading the UMAC */
@@ -315,23 +316,19 @@ int iwm_load_fw(struct iwm_priv *iwm)
                return ret;
        }
 
-#ifdef CONFIG_IWM_B0_HW_SUPPORT
-       if (iwm->conf.hw_b0) {
-               clear_bit(PHY_CALIBRATE_RX_IQ_CMD, &iwm->conf.init_calib_map);
-               clear_bit(PHY_CALIBRATE_RX_IQ_CMD,
-                         &iwm->conf.periodic_calib_map);
-       }
-#endif
+       init_calib_map = iwm->conf.calib_map & IWM_CALIB_MAP_INIT_MSK;
+       periodic_calib_map = IWM_CALIB_MAP_PER_LMAC(iwm->conf.calib_map);
+
        /* Read RX IQ calibration result from EEPROM */
-       if (test_bit(PHY_CALIBRATE_RX_IQ_CMD, &iwm->conf.init_calib_map)) {
+       if (test_bit(PHY_CALIBRATE_RX_IQ_CMD, &init_calib_map)) {
                iwm_store_rxiq_calib_result(iwm);
                set_bit(PHY_CALIBRATE_RX_IQ_CMD, &iwm->calib_done_map);
        }
 
        iwm_send_prio_table(iwm);
-       iwm_send_init_calib_cfg(iwm, iwm->conf.init_calib_map);
+       iwm_send_init_calib_cfg(iwm, init_calib_map);
 
-       while (iwm->calib_done_map != iwm->conf.init_calib_map) {
+       while (iwm->calib_done_map != init_calib_map) {
                ret = iwm_notif_handle(iwm, CALIBRATION_RES_NOTIFICATION,
                                       IWM_SRC_LMAC, WAIT_NOTIF_TIMEOUT);
                if (ret) {
@@ -340,7 +337,7 @@ int iwm_load_fw(struct iwm_priv *iwm)
                }
                IWM_DBG_FW(iwm, DBG, "Got calibration result. calib_done_map: "
                           "0x%lx, requested calibrations: 0x%lx\n",
-                          iwm->calib_done_map, iwm->conf.init_calib_map);
+                          iwm->calib_done_map, init_calib_map);
        }
 
        /* Handle LMAC CALIBRATION_COMPLETE notification */
@@ -378,7 +375,7 @@ int iwm_load_fw(struct iwm_priv *iwm)
 
        iwm_send_prio_table(iwm);
        iwm_send_calib_results(iwm);
-       iwm_send_periodic_calib_cfg(iwm, iwm->conf.periodic_calib_map);
+       iwm_send_periodic_calib_cfg(iwm, periodic_calib_map);
 
        return 0;