Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl-3945.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index a793cd11f73806163143e468825c0812ff84fd79..4fdeb53232486a1fac23eae1735c53fc338fd8f8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -265,7 +265,7 @@ void iwl3945_add_radiotap(struct iwl3945_priv *priv, struct sk_buff *skb,
        if (skb_headroom(skb) < sizeof(*iwl3945_rt)) {
                if (net_ratelimit())
                        printk(KERN_ERR "not enough headroom [%d] for "
-                              "radiotap head [%d]\n",
+                              "radiotap head [%zd]\n",
                               skb_headroom(skb), sizeof(*iwl3945_rt));
                return;
        }
@@ -520,10 +520,8 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                        break;
 
                        /*
-                        * TODO: There is no callback function from upper
-                        * stack to inform us when associated status. this
-                        * work around to sniff assoc_resp management frame
-                        * and finish the association process.
+                        * TODO: Use the new callback function from
+                        * mac80211 instead of sniffing these packets.
                         */
                case IEEE80211_STYPE_ASSOC_RESP:
                case IEEE80211_STYPE_REASSOC_RESP:{
@@ -1006,14 +1004,6 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
                            CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MM);
        }
 
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       /* Initialize the EEPROM */
-       rc = iwl3945_eeprom_init(priv);
-       if (rc)
-               return rc;
-
-       spin_lock_irqsave(&priv->lock, flags);
        if (EEPROM_SKU_CAP_OP_MODE_MRC == priv->eeprom.sku_cap) {
                IWL_DEBUG_INFO("SKU OP mode is mrc\n");
                iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
@@ -2379,18 +2369,4 @@ struct pci_device_id iwl3945_hw_card_ids[] = {
        {0}
 };
 
-/*
- * Clear the OWNER_MSK, to establish driver (instead of uCode running on
- * embedded controller) as EEPROM reader; each read is a series of pulses
- * to/from the EEPROM chip, not a single event, so even reads could conflict
- * if they weren't arbitrated by some ownership mechanism.  Here, the driver
- * simply claims ownership, which should be safe when this function is called
- * (i.e. before loading uCode!).
- */
-inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv)
-{
-       _iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
-       return 0;
-}
-
 MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);