leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: remove calib channel section from PHY DB

Browse Source 
Remove calibration per-channel data as it's no longer used.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
David Spinadel 2013-06-12 16:58:04 +03:00 committed by Johannes Berg
parent b002c7e1f3
commit 12dcf2c332
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/wireless/iwlwifi/iwl-phy-db.c
View File

@ -92,20 +92,16 @@ struct iwl_phy_db_entry {
struct iwl_phy_db { struct iwl_phy_db {
struct iwl_phy_db_entry cfg; struct iwl_phy_db_entry cfg;
struct iwl_phy_db_entry calib_nch; struct iwl_phy_db_entry calib_nch;
struct iwl_phy_db_entry calib_ch;
struct iwl_phy_db_entry calib_ch_group_papd[IWL_NUM_PAPD_CH_GROUPS]; struct iwl_phy_db_entry calib_ch_group_papd[IWL_NUM_PAPD_CH_GROUPS];
struct iwl_phy_db_entry calib_ch_group_txp[IWL_NUM_TXP_CH_GROUPS]; struct iwl_phy_db_entry calib_ch_group_txp[IWL_NUM_TXP_CH_GROUPS];
u32 channel_num;
u32 channel_size;
struct iwl_trans *trans; struct iwl_trans *trans;
}; };
enum iwl_phy_db_section_type { enum iwl_phy_db_section_type {
IWL_PHY_DB_CFG = 1, IWL_PHY_DB_CFG = 1,
IWL_PHY_DB_CALIB_NCH, IWL_PHY_DB_CALIB_NCH,
IWL_PHY_DB_CALIB_CH, IWL_PHY_DB_UNUSED,
IWL_PHY_DB_CALIB_CHG_PAPD, IWL_PHY_DB_CALIB_CHG_PAPD,
IWL_PHY_DB_CALIB_CHG_TXP, IWL_PHY_DB_CALIB_CHG_TXP,
IWL_PHY_DB_MAX IWL_PHY_DB_MAX
@ -169,8 +165,6 @@ iwl_phy_db_get_section(struct iwl_phy_db *phy_db,
return &phy_db->cfg; return &phy_db->cfg;
case IWL_PHY_DB_CALIB_NCH: case IWL_PHY_DB_CALIB_NCH:
return &phy_db->calib_nch; return &phy_db->calib_nch;
case IWL_PHY_DB_CALIB_CH:
return &phy_db->calib_ch;
case IWL_PHY_DB_CALIB_CHG_PAPD: case IWL_PHY_DB_CALIB_CHG_PAPD:
if (chg_id >= IWL_NUM_PAPD_CH_GROUPS) if (chg_id >= IWL_NUM_PAPD_CH_GROUPS)
return NULL; return NULL;
@ -208,7 +202,6 @@ void iwl_phy_db_free(struct iwl_phy_db *phy_db)
iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CFG, 0); iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CFG, 0);
iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_NCH, 0); iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_NCH, 0);
iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CH, 0);
for (i = 0; i < IWL_NUM_PAPD_CH_GROUPS; i++) for (i = 0; i < IWL_NUM_PAPD_CH_GROUPS; i++)
iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_PAPD, i); iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_PAPD, i);
for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++) for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++)
@ -248,13 +241,6 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt,
entry->size = size; entry->size = size;
if (type == IWL_PHY_DB_CALIB_CH) {
phy_db->channel_num =
le32_to_cpup((__le32 *)phy_db_notif->data);
phy_db->channel_size =
(size - CHANNEL_NUM_SIZE) / phy_db->channel_num;
}
IWL_DEBUG_INFO(phy_db->trans, IWL_DEBUG_INFO(phy_db->trans,
"%s(%d): [PHYDB]SET: Type %d , Size: %d\n", "%s(%d): [PHYDB]SET: Type %d , Size: %d\n",
__func__, __LINE__, type, size); __func__, __LINE__, type, size);
@ -328,10 +314,7 @@ int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
u32 type, u8 **data, u16 *size, u16 ch_id) u32 type, u8 **data, u16 *size, u16 ch_id)
{ {
struct iwl_phy_db_entry *entry; struct iwl_phy_db_entry *entry;
u32 channel_num;
u32 channel_size;
u16 ch_group_id = 0; u16 ch_group_id = 0;
u16 index;
if (!phy_db) if (!phy_db)
return -EINVAL; return -EINVAL;
@ -346,21 +329,8 @@ int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
if (!entry) if (!entry)
return -EINVAL; return -EINVAL;
if (type == IWL_PHY_DB_CALIB_CH) { *data = entry->data;
index = ch_id_to_ch_index(ch_id); *size = entry->size;
channel_num = phy_db->channel_num;
channel_size = phy_db->channel_size;
if (index >= channel_num) {
IWL_ERR(phy_db->trans, "Wrong channel number %d\n",
ch_id);
return -EINVAL;
}
*data = entry->data + CHANNEL_NUM_SIZE + index * channel_size;
*size = channel_size;
} else {
*data = entry->data;
*size = entry->size;
}
IWL_DEBUG_INFO(phy_db->trans, IWL_DEBUG_INFO(phy_db->trans,
"%s(%d): [PHYDB] GET: Type %d , Size: %d\n", "%s(%d): [PHYDB] GET: Type %d , Size: %d\n",