2 files changed, 67 insertions, 58 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index fe63bf21c67e..2088ac029b35 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2140,7 +2140,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
         DECLARE_SSID_BUF(ssid);
 
         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                  "disassociated: '%s' %pM \n",
+                  "disassociated: '%s' %pM\n",
                   print_ssid(ssid, priv->essid, priv->essid_len),
                   priv->bssid);
 
@@ -3285,7 +3285,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
 
         if (inta & IPW2100_INTA_PARITY_ERROR) {
                 printk(KERN_ERR DRV_NAME
-                       ": ***** PARITY ERROR INTERRUPT !!!! \n");
+                       ": ***** PARITY ERROR INTERRUPT !!!!\n");
                 priv->inta_other++;
                 write_register(dev, IPW_REG_INTA, IPW2100_INTA_PARITY_ERROR);
         }
@@ -6753,7 +6753,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
                 err = -EOPNOTSUPP;
                 goto done;
         } else {                /* Set the channel */
-                IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+                IPW_DEBUG_WX("SET Freq/Channel -> %d\n", fwrq->m);
                 err = ipw2100_set_channel(priv, fwrq->m, 0);
         }
 
@@ -6782,7 +6782,7 @@ static int ipw2100_wx_get_freq(struct net_device *dev,
         else
                 wrqu->freq.m = 0;
 
-        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        IPW_DEBUG_WX("GET Freq/Channel -> %d\n", priv->channel);
         return 0;
 
 }
@@ -6794,7 +6794,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
         struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
-        IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
+        IPW_DEBUG_WX("SET Mode -> %d\n", wrqu->mode);
 
         if (wrqu->mode == priv->ieee->iw_mode)
                 return 0;
@@ -7149,7 +7149,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
         memset(priv->nick, 0, sizeof(priv->nick));
         memcpy(priv->nick, extra, wrqu->data.length);
 
-        IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick);
+        IPW_DEBUG_WX("SET Nickname -> %s\n", priv->nick);
 
         return 0;
 }
@@ -7168,7 +7168,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
         memcpy(extra, priv->nick, wrqu->data.length);
         wrqu->data.flags = 1;   /* active */
 
-        IPW_DEBUG_WX("GET Nickname -> %s \n", extra);
+        IPW_DEBUG_WX("GET Nickname -> %s\n", extra);
 
         return 0;
 }
@@ -7207,7 +7207,7 @@ static int ipw2100_wx_set_rate(struct net_device *dev,
 
         err = ipw2100_set_tx_rates(priv, rate, 0);
 
-        IPW_DEBUG_WX("SET Rate -> %04X \n", rate);
+        IPW_DEBUG_WX("SET Rate -> %04X\n", rate);
       done:
         mutex_unlock(&priv->action_mutex);
         return err;
@@ -7258,7 +7258,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
                 wrqu->bitrate.value = 0;
         }
 
-        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+        IPW_DEBUG_WX("GET Rate -> %d\n", wrqu->bitrate.value);
 
       done:
         mutex_unlock(&priv->action_mutex);
@@ -7294,7 +7294,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
 
         err = ipw2100_set_rts_threshold(priv, value);
 
-        IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value);
+        IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X\n", value);
       done:
         mutex_unlock(&priv->action_mutex);
         return err;
@@ -7316,7 +7316,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
         /* If RTS is set to the default value, then it is disabled */
         wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;
 
-        IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X \n", wrqu->rts.value);
+        IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X\n", wrqu->rts.value);
 
         return 0;
 }
@@ -7355,7 +7355,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
 
         err = ipw2100_set_tx_power(priv, value);
 
-        IPW_DEBUG_WX("SET TX Power -> %d \n", value);
+        IPW_DEBUG_WX("SET TX Power -> %d\n", value);
 
       done:
         mutex_unlock(&priv->action_mutex);
@@ -7384,7 +7384,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
 
         wrqu->txpower.flags = IW_TXPOW_DBM;
 
-        IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->txpower.value);
+        IPW_DEBUG_WX("GET TX Power -> %d\n", wrqu->txpower.value);
 
         return 0;
 }
@@ -7414,7 +7414,7 @@ static int ipw2100_wx_set_frag(struct net_device *dev,
                 priv->frag_threshold = priv->ieee->fts;
         }
 
-        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", priv->ieee->fts);
+        IPW_DEBUG_WX("SET Frag Threshold -> %d\n", priv->ieee->fts);
 
         return 0;
 }
@@ -7432,7 +7432,7 @@ static int ipw2100_wx_get_frag(struct net_device *dev,
         wrqu->frag.fixed = 0;   /* no auto select */
         wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
 
-        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+        IPW_DEBUG_WX("GET Frag Threshold -> %d\n", wrqu->frag.value);
 
         return 0;
 }
@@ -7458,14 +7458,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
 
         if (wrqu->retry.flags & IW_RETRY_SHORT) {
                 err = ipw2100_set_short_retry(priv, wrqu->retry.value);
-                IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
+                IPW_DEBUG_WX("SET Short Retry Limit -> %d\n",
                              wrqu->retry.value);
                 goto done;
         }
 
         if (wrqu->retry.flags & IW_RETRY_LONG) {
                 err = ipw2100_set_long_retry(priv, wrqu->retry.value);
-                IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
+                IPW_DEBUG_WX("SET Long Retry Limit -> %d\n",
                              wrqu->retry.value);
                 goto done;
         }
@@ -7474,7 +7474,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
         if (!err)
                 err = ipw2100_set_long_retry(priv, wrqu->retry.value);
 
-        IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value);
+        IPW_DEBUG_WX("SET Both Retry Limits -> %d\n", wrqu->retry.value);
 
       done:
         mutex_unlock(&priv->action_mutex);
@@ -7508,7 +7508,7 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
                 wrqu->retry.value = priv->short_retry_limit;
         }
 
-        IPW_DEBUG_WX("GET Retry -> %d \n", wrqu->retry.value);
+        IPW_DEBUG_WX("GET Retry -> %d\n", wrqu->retry.value);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 7266730680bc..82de71a3aea7 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -459,7 +459,7 @@ static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
 {
         u32 word;
         _ipw_write32(priv, IPW_INDIRECT_ADDR, reg & IPW_INDIRECT_ADDR_MASK);
-        IPW_DEBUG_IO(" reg = 0x%8X : \n", reg);
+        IPW_DEBUG_IO(" reg = 0x%8X :\n", reg);
         word = _ipw_read32(priv, IPW_INDIRECT_DATA);
         return (word >> ((reg & 0x3) * 8)) & 0xff;
 }
@@ -473,7 +473,7 @@ static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
 
         _ipw_write32(priv, IPW_INDIRECT_ADDR, reg);
         value = _ipw_read32(priv, IPW_INDIRECT_DATA);
-        IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x \n", reg, value);
+        IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x\n", reg, value);
         return value;
 }
 
@@ -2349,16 +2349,25 @@ static void ipw_bg_adapter_restart(struct work_struct *work)
         mutex_unlock(&priv->mutex);
 }
 
-#define IPW_SCAN_CHECK_WATCHDOG (5 * HZ)
+static void ipw_abort_scan(struct ipw_priv *priv);
+
+#define IPW_SCAN_CHECK_WATCHDOG (5 * HZ)
 
 static void ipw_scan_check(void *data)
 {
         struct ipw_priv *priv = data;
-        if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
+
+        if (priv->status & STATUS_SCAN_ABORTING) {
                 IPW_DEBUG_SCAN("Scan completion watchdog resetting "
                                "adapter after (%dms).\n",
                                jiffies_to_msecs(IPW_SCAN_CHECK_WATCHDOG));
                 queue_work(priv->workqueue, &priv->adapter_restart);
+        } else if (priv->status & STATUS_SCANNING) {
+                IPW_DEBUG_SCAN("Scan completion watchdog aborting scan "
+                               "after (%dms).\n",
+                               jiffies_to_msecs(IPW_SCAN_CHECK_WATCHDOG));
+                ipw_abort_scan(priv);
+                queue_delayed_work(priv->workqueue, &priv->scan_check, HZ);
         }
 }
 
@@ -2739,7 +2748,7 @@ static inline void ipw_fw_dma_reset_command_blocks(struct ipw_priv *priv)
 static int ipw_fw_dma_enable(struct ipw_priv *priv)
 {                               /* start dma engine but no transfers yet */
 
-        IPW_DEBUG_FW(">> : \n");
+        IPW_DEBUG_FW(">> :\n");
 
         /* Start the dma */
         ipw_fw_dma_reset_command_blocks(priv);
@@ -2747,7 +2756,7 @@ static int ipw_fw_dma_enable(struct ipw_priv *priv)
         /* Write CB base address */
         ipw_write_reg32(priv, IPW_DMA_I_CB_BASE, IPW_SHARED_SRAM_DMA_CONTROL);
 
-        IPW_DEBUG_FW("<< : \n");
+        IPW_DEBUG_FW("<< :\n");
         return 0;
 }
 
@@ -2762,7 +2771,7 @@ static void ipw_fw_dma_abort(struct ipw_priv *priv)
         ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control);
         priv->sram_desc.last_cb_index = 0;
 
-        IPW_DEBUG_FW("<< \n");
+        IPW_DEBUG_FW("<<\n");
 }
 
 static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index,
@@ -2813,29 +2822,29 @@ static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
 
         IPW_DEBUG_FW(">> :\n");
         address = ipw_read_reg32(priv, IPW_DMA_I_CURRENT_CB);
-        IPW_DEBUG_FW_INFO("Current CB is 0x%x \n", address);
+        IPW_DEBUG_FW_INFO("Current CB is 0x%x\n", address);
 
         /* Read the DMA Controlor register */
         register_value = ipw_read_reg32(priv, IPW_DMA_I_DMA_CONTROL);
-        IPW_DEBUG_FW_INFO("IPW_DMA_I_DMA_CONTROL is 0x%x \n", register_value);
+        IPW_DEBUG_FW_INFO("IPW_DMA_I_DMA_CONTROL is 0x%x\n", register_value);
 
         /* Print the CB values */
         cb_fields_address = address;
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n", register_value);
+        IPW_DEBUG_FW_INFO("Current CB Control Field is 0x%x\n", register_value);
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n", register_value);
+        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x\n", register_value);
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x \n",
+        IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x\n",
                           register_value);
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n", register_value);
+        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x\n", register_value);
 
         IPW_DEBUG_FW(">> :\n");
 }
@@ -2851,7 +2860,7 @@ static int ipw_fw_dma_command_block_index(struct ipw_priv *priv)
         current_cb_index = (current_cb_address - IPW_SHARED_SRAM_DMA_CONTROL) /
             sizeof(struct command_block);
 
-        IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X \n",
+        IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X\n",
                           current_cb_index, current_cb_address);
 
         IPW_DEBUG_FW(">> :\n");
@@ -2910,7 +2919,7 @@ static int ipw_fw_dma_add_buffer(struct ipw_priv *priv, dma_addr_t *src_address,
         int ret, i;
         u32 size;
 
-        IPW_DEBUG_FW(">> \n");
+        IPW_DEBUG_FW(">>\n");
         IPW_DEBUG_FW_INFO("nr=%d dest_address=0x%x len=0x%x\n",
                           nr, dest_address, len);
 
@@ -2927,7 +2936,7 @@ static int ipw_fw_dma_add_buffer(struct ipw_priv *priv, dma_addr_t *src_address,
                         IPW_DEBUG_FW_INFO(": Added new cb\n");
         }
 
-        IPW_DEBUG_FW("<< \n");
+        IPW_DEBUG_FW("<<\n");
         return 0;
 }
 
@@ -2936,7 +2945,7 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
         u32 current_index = 0, previous_index;
         u32 watchdog = 0;
 
-        IPW_DEBUG_FW(">> : \n");
+        IPW_DEBUG_FW(">> :\n");
 
         current_index = ipw_fw_dma_command_block_index(priv);
         IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%08X\n",
@@ -2965,7 +2974,7 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
         ipw_set_bit(priv, IPW_RESET_REG,
                     IPW_RESET_REG_MASTER_DISABLED | IPW_RESET_REG_STOP_MASTER);
 
-        IPW_DEBUG_FW("<< dmaWaitSync \n");
+        IPW_DEBUG_FW("<< dmaWaitSync\n");
         return 0;
 }
 
@@ -3026,7 +3035,7 @@ static int ipw_stop_master(struct ipw_priv *priv)
 {
         int rc;
 
-        IPW_DEBUG_TRACE(">> \n");
+        IPW_DEBUG_TRACE(">>\n");
         /* stop master. typical delay - 0 */
         ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_STOP_MASTER);
 
@@ -3045,7 +3054,7 @@ static int ipw_stop_master(struct ipw_priv *priv)
 
 static void ipw_arc_release(struct ipw_priv *priv)
 {
-        IPW_DEBUG_TRACE(">> \n");
+        IPW_DEBUG_TRACE(">>\n");
         mdelay(5);
 
         ipw_clear_bit(priv, IPW_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
@@ -3067,7 +3076,7 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
 
         image = (__le16 *) data;
 
-        IPW_DEBUG_TRACE(">> \n");
+        IPW_DEBUG_TRACE(">>\n");
 
         rc = ipw_stop_master(priv);
 
@@ -3181,7 +3190,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
         void **virts;
         dma_addr_t *phys;
 
-        IPW_DEBUG_TRACE("<< : \n");
+        IPW_DEBUG_TRACE("<< :\n");
 
         virts = kmalloc(sizeof(void *) * CB_NUMBER_OF_ELEMENTS_SMALL,
                         GFP_KERNEL);
@@ -4482,7 +4491,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                         case CMAS_ASSOCIATED:{
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "associated: '%s' %pM \n",
+                                                  "associated: '%s' %pM\n",
                                                   print_ssid(ssid, priv->essid,
                                                              priv->essid_len),
                                                   priv->bssid);
@@ -4563,7 +4572,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                           IPW_DL_ASSOC,
                                                           "deauthenticated: '%s' "
                                                           "%pM"
-                                                          ": (0x%04X) - %s \n",
+                                                          ": (0x%04X) - %s\n",
                                                           print_ssid(ssid,
                                                                      priv->
                                                                      essid,
@@ -4614,7 +4623,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "disassociated: '%s' %pM \n",
+                                                  "disassociated: '%s' %pM\n",
                                                   print_ssid(ssid, priv->essid,
                                                              priv->essid_len),
                                                   priv->bssid);
@@ -4652,7 +4661,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                         switch (auth->state) {
                         case CMAS_AUTHENTICATED:
                                 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                          "authenticated: '%s' %pM \n",
+                                          "authenticated: '%s' %pM\n",
                                           print_ssid(ssid, priv->essid,
                                                      priv->essid_len),
                                           priv->bssid);
@@ -6925,7 +6934,7 @@ static u8 ipw_qos_current_mode(struct ipw_priv * priv)
         } else {
                 mode = priv->ieee->mode;
         }
-        IPW_DEBUG_QOS("QoS network/card mode %d \n", mode);
+        IPW_DEBUG_QOS("QoS network/card mode %d\n", mode);
         return mode;
 }
 
@@ -6965,7 +6974,7 @@ static int ipw_qos_handle_probe_response(struct ipw_priv *priv,
                                &def_parameters_OFDM, size);
 
                 if ((network->qos_data.active == 1) && (active_network == 1)) {
-                        IPW_DEBUG_QOS("QoS was disabled call qos_activate \n");
+                        IPW_DEBUG_QOS("QoS was disabled call qos_activate\n");
                         schedule_work(&priv->qos_activate);
                 }
 
@@ -7542,7 +7551,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
                 return err;
         }
 
-        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n",
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM\n",
                   print_ssid(ssid, priv->essid, priv->essid_len),
                   priv->bssid);
 
@@ -8793,7 +8802,7 @@ static int ipw_wx_set_freq(struct net_device *dev,
                 }
         }
 
-        IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+        IPW_DEBUG_WX("SET Freq/Channel -> %d\n", fwrq->m);
         mutex_lock(&priv->mutex);
         ret = ipw_set_channel(priv, channel);
         mutex_unlock(&priv->mutex);
@@ -8835,7 +8844,7 @@ static int ipw_wx_get_freq(struct net_device *dev,
                 wrqu->freq.m = 0;
 
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        IPW_DEBUG_WX("GET Freq/Channel -> %d\n", priv->channel);
         return 0;
 }
 
@@ -9230,7 +9239,7 @@ static int ipw_wx_get_sens(struct net_device *dev,
         wrqu->sens.value = priv->roaming_threshold;
         mutex_unlock(&priv->mutex);
 
-        IPW_DEBUG_WX("GET roaming threshold -> %s %d \n",
+        IPW_DEBUG_WX("GET roaming threshold -> %s %d\n",
                      wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value);
 
         return 0;
@@ -9358,7 +9367,7 @@ static int ipw_wx_get_rate(struct net_device *dev,
         wrqu->bitrate.value = priv->last_rate;
         wrqu->bitrate.fixed = (priv->config & CFG_FIXED_RATE) ? 1 : 0;
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+        IPW_DEBUG_WX("GET Rate -> %d\n", wrqu->bitrate.value);
         return 0;
 }
 
@@ -9381,7 +9390,7 @@ static int ipw_wx_set_rts(struct net_device *dev,
 
         ipw_send_rts_threshold(priv, priv->rts_threshold);
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("SET RTS Threshold -> %d \n", priv->rts_threshold);
+        IPW_DEBUG_WX("SET RTS Threshold -> %d\n", priv->rts_threshold);
         return 0;
 }
 
@@ -9395,7 +9404,7 @@ static int ipw_wx_get_rts(struct net_device *dev,
         wrqu->rts.fixed = 0;    /* no auto select */
         wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("GET RTS Threshold -> %d \n", wrqu->rts.value);
+        IPW_DEBUG_WX("GET RTS Threshold -> %d\n", wrqu->rts.value);
         return 0;
 }
 
@@ -9445,7 +9454,7 @@ static int ipw_wx_get_txpow(struct net_device *dev,
         wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
         mutex_unlock(&priv->mutex);
 
-        IPW_DEBUG_WX("GET TX Power -> %s %d \n",
+        IPW_DEBUG_WX("GET TX Power -> %s %d\n",
                      wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value);
 
         return 0;
@@ -9471,7 +9480,7 @@ static int ipw_wx_set_frag(struct net_device *dev,
 
         ipw_send_frag_threshold(priv, wrqu->frag.value);
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", wrqu->frag.value);
+        IPW_DEBUG_WX("SET Frag Threshold -> %d\n", wrqu->frag.value);
         return 0;
 }
 
@@ -9485,7 +9494,7 @@ static int ipw_wx_get_frag(struct net_device *dev,
         wrqu->frag.fixed = 0;   /* no auto select */
         wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FTS);
         mutex_unlock(&priv->mutex);
-        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+        IPW_DEBUG_WX("GET Frag Threshold -> %d\n", wrqu->frag.value);
 
         return 0;
 }
@@ -9549,7 +9558,7 @@ static int ipw_wx_get_retry(struct net_device *dev,
         }
         mutex_unlock(&priv->mutex);
 
-        IPW_DEBUG_WX("GET retry -> %d \n", wrqu->retry.value);
+        IPW_DEBUG_WX("GET retry -> %d\n", wrqu->retry.value);
 
         return 0;
 }