Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[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 77e7202c026b780359e8827a2d30894be29264a1..8d4d91d35fd29f14ed3b8c21323da34c7122c264 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -238,9 +238,10 @@ void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl3945_rx_mem_b
        priv->last_statistics_time = jiffies;
 }
 
-void iwl3945_add_radiotap(struct iwl3945_priv *priv, struct sk_buff *skb,
-                         struct iwl3945_rx_frame_hdr *rx_hdr,
-                         struct ieee80211_rx_status *stats)
+static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
+                                struct sk_buff *skb,
+                                struct iwl3945_rx_frame_hdr *rx_hdr,
+                                struct ieee80211_rx_status *stats)
 {
        /* First cache any information we need before we overwrite
         * the information provided in the skb from the hardware */
@@ -265,7 +266,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;
        }
@@ -1004,14 +1005,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,
@@ -2377,18 +2370,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);