aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-31 11:34:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 15:26:37 -0400
commit3867fe0477a1e23df3d05131320d7b0075a9bed0 (patch)
treef45351d19078c47adaa750224557dd6c9431f7e6
parent139455c3912bfed4bd42824d59c82113cc667f91 (diff)
iwlwifi: make iwl_hw_detect static to _agn
iwl_hw_detect() only used by _agn, make it static Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c7
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c8
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h1
3 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d3de5096a620..8d4a2b569f05 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3883,6 +3883,13 @@ static struct ieee80211_ops iwl_hw_ops = {
3883 .flush = iwl_mac_flush, 3883 .flush = iwl_mac_flush,
3884}; 3884};
3885 3885
3886static void iwl_hw_detect(struct iwl_priv *priv)
3887{
3888 priv->hw_rev = _iwl_read32(priv, CSR_HW_REV);
3889 priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG);
3890 pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id);
3891}
3892
3886static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 3893static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3887{ 3894{
3888 int err = 0; 3895 int err = 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 2c03c6e20a72..db8f15f3df46 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -183,14 +183,6 @@ out:
183} 183}
184EXPORT_SYMBOL(iwl_alloc_all); 184EXPORT_SYMBOL(iwl_alloc_all);
185 185
186void iwl_hw_detect(struct iwl_priv *priv)
187{
188 priv->hw_rev = _iwl_read32(priv, CSR_HW_REV);
189 priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG);
190 pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id);
191}
192EXPORT_SYMBOL(iwl_hw_detect);
193
194/* 186/*
195 * QoS support 187 * QoS support
196*/ 188*/
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index a8fa31f360ea..ac16f582d6d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -347,7 +347,6 @@ struct iwl_cfg {
347 347
348struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg, 348struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,
349 struct ieee80211_ops *hw_ops); 349 struct ieee80211_ops *hw_ops);
350void iwl_hw_detect(struct iwl_priv *priv);
351void iwl_activate_qos(struct iwl_priv *priv); 350void iwl_activate_qos(struct iwl_priv *priv);
352int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, 351int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
353 const struct ieee80211_tx_queue_params *params); 352 const struct ieee80211_tx_queue_params *params);