diff options
author | Samuel Ortiz <samuel.ortiz@intel.com> | 2009-01-23 16:45:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:01:36 -0500 |
commit | d08853a3995cfc2985307da7400fb57bfa5773e2 (patch) | |
tree | c346e9b3e9654b3a238827c49c59ffc64e37d78e /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 534166dedaa9a660c7221b145b5e4088a2d9ac69 (diff) |
iwlwifi: Remove IWL3945_DEBUG
IWL3945_DEBUG is pointless and obsolete. We already have an IWLWIFI_DEBUG
symbol, that needs to be set if we actually want to get 3945 debug (see
iwl-debug.h).
Thus, we can simply get rid of this symbol.
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 5fa5cb2c21a4..d832cb95a928 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #define DRV_DESCRIPTION \ | 63 | #define DRV_DESCRIPTION \ |
64 | "Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux" | 64 | "Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux" |
65 | 65 | ||
66 | #ifdef CONFIG_IWL3945_DEBUG | 66 | #ifdef CONFIG_IWLWIFI_DEBUG |
67 | #define VD "d" | 67 | #define VD "d" |
68 | #else | 68 | #else |
69 | #define VD | 69 | #define VD |
@@ -1503,7 +1503,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
1503 | 1503 | ||
1504 | fc = hdr->frame_control; | 1504 | fc = hdr->frame_control; |
1505 | 1505 | ||
1506 | #ifdef CONFIG_IWL3945_DEBUG | 1506 | #ifdef CONFIG_IWLWIFI_DEBUG |
1507 | if (ieee80211_is_auth(fc)) | 1507 | if (ieee80211_is_auth(fc)) |
1508 | IWL_DEBUG_TX("Sending AUTH frame\n"); | 1508 | IWL_DEBUG_TX("Sending AUTH frame\n"); |
1509 | else if (ieee80211_is_assoc_req(fc)) | 1509 | else if (ieee80211_is_assoc_req(fc)) |
@@ -2045,7 +2045,7 @@ static void iwl3945_rx_spectrum_measure_notif(struct iwl_priv *priv, | |||
2045 | static void iwl3945_rx_pm_sleep_notif(struct iwl_priv *priv, | 2045 | static void iwl3945_rx_pm_sleep_notif(struct iwl_priv *priv, |
2046 | struct iwl_rx_mem_buffer *rxb) | 2046 | struct iwl_rx_mem_buffer *rxb) |
2047 | { | 2047 | { |
2048 | #ifdef CONFIG_IWL3945_DEBUG | 2048 | #ifdef CONFIG_IWLWIFI_DEBUG |
2049 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; | 2049 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; |
2050 | struct iwl_sleep_notification *sleep = &(pkt->u.sleep_notif); | 2050 | struct iwl_sleep_notification *sleep = &(pkt->u.sleep_notif); |
2051 | IWL_DEBUG_RX("sleep mode: %d, src: %d\n", | 2051 | IWL_DEBUG_RX("sleep mode: %d, src: %d\n", |
@@ -2092,7 +2092,7 @@ static void iwl3945_bg_beacon_update(struct work_struct *work) | |||
2092 | static void iwl3945_rx_beacon_notif(struct iwl_priv *priv, | 2092 | static void iwl3945_rx_beacon_notif(struct iwl_priv *priv, |
2093 | struct iwl_rx_mem_buffer *rxb) | 2093 | struct iwl_rx_mem_buffer *rxb) |
2094 | { | 2094 | { |
2095 | #ifdef CONFIG_IWL3945_DEBUG | 2095 | #ifdef CONFIG_IWLWIFI_DEBUG |
2096 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; | 2096 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; |
2097 | struct iwl3945_beacon_notif *beacon = &(pkt->u.beacon_status); | 2097 | struct iwl3945_beacon_notif *beacon = &(pkt->u.beacon_status); |
2098 | u8 rate = beacon->beacon_notify_hdr.rate; | 2098 | u8 rate = beacon->beacon_notify_hdr.rate; |
@@ -2115,7 +2115,7 @@ static void iwl3945_rx_beacon_notif(struct iwl_priv *priv, | |||
2115 | static void iwl3945_rx_reply_scan(struct iwl_priv *priv, | 2115 | static void iwl3945_rx_reply_scan(struct iwl_priv *priv, |
2116 | struct iwl_rx_mem_buffer *rxb) | 2116 | struct iwl_rx_mem_buffer *rxb) |
2117 | { | 2117 | { |
2118 | #ifdef CONFIG_IWL3945_DEBUG | 2118 | #ifdef CONFIG_IWLWIFI_DEBUG |
2119 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; | 2119 | struct iwl_rx_packet *pkt = (void *)rxb->skb->data; |
2120 | struct iwl_scanreq_notification *notif = | 2120 | struct iwl_scanreq_notification *notif = |
2121 | (struct iwl_scanreq_notification *)pkt->u.raw; | 2121 | (struct iwl_scanreq_notification *)pkt->u.raw; |
@@ -2788,7 +2788,7 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) | |||
2788 | iwl3945_rx_queue_restock(priv); | 2788 | iwl3945_rx_queue_restock(priv); |
2789 | } | 2789 | } |
2790 | 2790 | ||
2791 | #ifdef CONFIG_IWL3945_DEBUG | 2791 | #ifdef CONFIG_IWLWIFI_DEBUG |
2792 | static void iwl3945_print_rx_config_cmd(struct iwl_priv *priv, | 2792 | static void iwl3945_print_rx_config_cmd(struct iwl_priv *priv, |
2793 | struct iwl3945_rxon_cmd *rxon) | 2793 | struct iwl3945_rxon_cmd *rxon) |
2794 | { | 2794 | { |
@@ -3028,7 +3028,7 @@ static void iwl3945_irq_handle_error(struct iwl_priv *priv) | |||
3028 | /* Cancel currently queued command. */ | 3028 | /* Cancel currently queued command. */ |
3029 | clear_bit(STATUS_HCMD_ACTIVE, &priv->status); | 3029 | clear_bit(STATUS_HCMD_ACTIVE, &priv->status); |
3030 | 3030 | ||
3031 | #ifdef CONFIG_IWL3945_DEBUG | 3031 | #ifdef CONFIG_IWLWIFI_DEBUG |
3032 | if (priv->debug_level & IWL_DL_FW_ERRORS) { | 3032 | if (priv->debug_level & IWL_DL_FW_ERRORS) { |
3033 | iwl3945_dump_nic_error_log(priv); | 3033 | iwl3945_dump_nic_error_log(priv); |
3034 | iwl3945_dump_nic_event_log(priv); | 3034 | iwl3945_dump_nic_event_log(priv); |
@@ -3077,7 +3077,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) | |||
3077 | u32 inta, handled = 0; | 3077 | u32 inta, handled = 0; |
3078 | u32 inta_fh; | 3078 | u32 inta_fh; |
3079 | unsigned long flags; | 3079 | unsigned long flags; |
3080 | #ifdef CONFIG_IWL3945_DEBUG | 3080 | #ifdef CONFIG_IWLWIFI_DEBUG |
3081 | u32 inta_mask; | 3081 | u32 inta_mask; |
3082 | #endif | 3082 | #endif |
3083 | 3083 | ||
@@ -3095,7 +3095,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) | |||
3095 | inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS); | 3095 | inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS); |
3096 | iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh); | 3096 | iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh); |
3097 | 3097 | ||
3098 | #ifdef CONFIG_IWL3945_DEBUG | 3098 | #ifdef CONFIG_IWLWIFI_DEBUG |
3099 | if (priv->debug_level & IWL_DL_ISR) { | 3099 | if (priv->debug_level & IWL_DL_ISR) { |
3100 | /* just for debug */ | 3100 | /* just for debug */ |
3101 | inta_mask = iwl_read32(priv, CSR_INT_MASK); | 3101 | inta_mask = iwl_read32(priv, CSR_INT_MASK); |
@@ -3129,7 +3129,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) | |||
3129 | return; | 3129 | return; |
3130 | } | 3130 | } |
3131 | 3131 | ||
3132 | #ifdef CONFIG_IWL3945_DEBUG | 3132 | #ifdef CONFIG_IWLWIFI_DEBUG |
3133 | if (priv->debug_level & (IWL_DL_ISR)) { | 3133 | if (priv->debug_level & (IWL_DL_ISR)) { |
3134 | /* NIC fires this, but we don't use it, redundant with WAKEUP */ | 3134 | /* NIC fires this, but we don't use it, redundant with WAKEUP */ |
3135 | if (inta & CSR_INT_BIT_SCD) | 3135 | if (inta & CSR_INT_BIT_SCD) |
@@ -3200,7 +3200,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) | |||
3200 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 3200 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
3201 | iwl3945_enable_interrupts(priv); | 3201 | iwl3945_enable_interrupts(priv); |
3202 | 3202 | ||
3203 | #ifdef CONFIG_IWL3945_DEBUG | 3203 | #ifdef CONFIG_IWLWIFI_DEBUG |
3204 | if (priv->debug_level & (IWL_DL_ISR)) { | 3204 | if (priv->debug_level & (IWL_DL_ISR)) { |
3205 | inta = iwl_read32(priv, CSR_INT); | 3205 | inta = iwl_read32(priv, CSR_INT); |
3206 | inta_mask = iwl_read32(priv, CSR_INT_MASK); | 3206 | inta_mask = iwl_read32(priv, CSR_INT_MASK); |
@@ -5414,7 +5414,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk | |||
5414 | * | 5414 | * |
5415 | *****************************************************************************/ | 5415 | *****************************************************************************/ |
5416 | 5416 | ||
5417 | #ifdef CONFIG_IWL3945_DEBUG | 5417 | #ifdef CONFIG_IWLWIFI_DEBUG |
5418 | 5418 | ||
5419 | /* | 5419 | /* |
5420 | * The following adds a new attribute to the sysfs representation | 5420 | * The following adds a new attribute to the sysfs representation |
@@ -5450,7 +5450,7 @@ static ssize_t store_debug_level(struct device *d, | |||
5450 | static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, | 5450 | static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, |
5451 | show_debug_level, store_debug_level); | 5451 | show_debug_level, store_debug_level); |
5452 | 5452 | ||
5453 | #endif /* CONFIG_IWL3945_DEBUG */ | 5453 | #endif /* CONFIG_IWLWIFI_DEBUG */ |
5454 | 5454 | ||
5455 | static ssize_t show_temperature(struct device *d, | 5455 | static ssize_t show_temperature(struct device *d, |
5456 | struct device_attribute *attr, char *buf) | 5456 | struct device_attribute *attr, char *buf) |
@@ -5930,7 +5930,7 @@ static struct attribute *iwl3945_sysfs_entries[] = { | |||
5930 | &dev_attr_status.attr, | 5930 | &dev_attr_status.attr, |
5931 | &dev_attr_temperature.attr, | 5931 | &dev_attr_temperature.attr, |
5932 | &dev_attr_tx_power.attr, | 5932 | &dev_attr_tx_power.attr, |
5933 | #ifdef CONFIG_IWL3945_DEBUG | 5933 | #ifdef CONFIG_IWLWIFI_DEBUG |
5934 | &dev_attr_debug_level.attr, | 5934 | &dev_attr_debug_level.attr, |
5935 | #endif | 5935 | #endif |
5936 | NULL | 5936 | NULL |
@@ -6082,7 +6082,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
6082 | priv->cfg = cfg; | 6082 | priv->cfg = cfg; |
6083 | priv->pci_dev = pdev; | 6083 | priv->pci_dev = pdev; |
6084 | 6084 | ||
6085 | #ifdef CONFIG_IWL3945_DEBUG | 6085 | #ifdef CONFIG_IWLWIFI_DEBUG |
6086 | priv->debug_level = iwl3945_mod_params.debug; | 6086 | priv->debug_level = iwl3945_mod_params.debug; |
6087 | atomic_set(&priv->restrict_refcnt, 0); | 6087 | atomic_set(&priv->restrict_refcnt, 0); |
6088 | #endif | 6088 | #endif |