net: remove trailing spaces in messages
Subsystems (6)
cover net: remove trailing spaces in messages
This is the third patchset to remove trailing spaces in kernel messages. Patches in this set cover wireless code.
Note that the last patch for libertas changes a debugfs header and not actually a message.
Patches have been rebased against current net-next.
Benefits are:
- general cleanup and consistency
- minor reduction in kernel size and user's log file size
- reduced annoyance for people writing logcheck rules
Shortstat:
30 files changed, 124 insertions(+), 124 deletions(-)
Frans Pop (7):
wireless: remove trailing space in messages wireless/ath: remove trailing space in messages wireless/ipw2x00: remove trailing space in messages wireless/iwlwifi: remove trailing space in messages wireless/prism54: remove trailing space in messages wireless/raylink: remove trailing space in messages wireless/libertas: remove trailing space in debugfs header
Cheers,
FJP
PATCH 1/7 wireless: remove trailing space in messages
Also correct indentation in net/wireless/reg.c.
--- net/mac80211/agg-tx.c | 4 ++-- net/wireless/reg.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
net/mac80211/agg-tx.c +2 -2
@@ -414,7 +414,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local, struct sta_info *sta, u16 tid) {#ifdef CONFIG_MAC80211_HT_DEBUG -printk (KERN_DEBUG "Aggregation is on for tid %d \n" , tid); +printk (KERN_DEBUG "Aggregation is on for tid %d\n" , tid);#endif spin_lock (&local->ampdu_lock);
@@ -674,7 +674,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,del_timer (&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer);#ifdef CONFIG_MAC80211_HT_DEBUG -printk (KERN_DEBUG "switched off addBA timer for tid %d \n" , tid); +printk (KERN_DEBUG "switched off addBA timer for tid %d\n" , tid);#endif /* CONFIG_MAC80211_HT_DEBUG */ if (le16_to_cpu(mgmt->u.action.u.addba_resp.status)
net/wireless/reg.c +3 -3
@@ -2357,10 +2357,10 @@ static void print_regdomain(const struct ieee80211_regdomain *rd) rdev->country_ie_alpha2[1]); }else printk (KERN_INFO "cfg80211: Current regulatory " -"domain intersected: \n" ); +"domain intersected:\n" ); }else -printk (KERN_INFO "cfg80211: Current regulatory " -"domain intersected: \n" ); +printk (KERN_INFO "cfg80211: Current regulatory " +"domain intersected:\n" ); }else if (is_world_regdom (rd->alpha2))printk (KERN_INFO "cfg80211: World regulatory " "domain updated:\n" );
Signature · 1 line
1.6.6.1
PATCH 2/7 wireless/ath: remove trailing space in messages
In reply to Frans Pop--- drivers/net/wireless/ath/ar9170/main.c | 8 ++++---- drivers/net/wireless/ath/ath9k/debug.c | 4 ++-- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +- drivers/net/wireless/ath/ath9k/gpio.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ar9170/main.c +4 -4
@@ -235,7 +235,7 @@ static void __ar9170_dump_txqueue(struct ar9170 *ar, wiphy_name(ar->hw->wiphy), skb_queue_len(queue)); skb_queue_walk(queue, skb) { -printk (KERN_DEBUG "index:%d => \n" , i++); +printk (KERN_DEBUG "index:%d =>\n" , i++);ar9170_print_txheader (ar, skb); }if (i !=skb_queue_len (queue))
@@ -280,7 +280,7 @@ static void ar9170_dump_tx_status_ampdu(struct ar9170 *ar)unsigned long flags;spin_lock_irqsave (&ar->tx_status_ampdu.lock, flags); -printk (KERN_DEBUG "%s: A-MPDU tx_status queue => \n" , +printk (KERN_DEBUG "%s: A-MPDU tx_status queue =>\n" ,wiphy_name (ar->hw->wiphy));__ar9170_dump_txqueue (ar, &ar->tx_status_ampdu);spin_unlock_irqrestore (&ar->tx_status_ampdu.lock, flags);
@@ -307,7 +307,7 @@ static void ar9170_recycle_expired(struct ar9170 *ar,if (time_is_before_jiffies (arinfo->timeout)) {#ifdef AR9170_QUEUE_DEBUG printk (KERN_DEBUG "%s: [%ld > %ld] frame expired => " -"recycle \n" ,wiphy_name (ar->hw->wiphy), +"recycle\n" ,wiphy_name (ar->hw->wiphy), jiffies, arinfo->timeout);ar9170_print_txheader (ar, skb);#endif /* AR9170_QUEUE_DEBUG */
@@ -1727,7 +1727,7 @@ static void ar9170_tx(struct ar9170 *ar)printk (KERN_DEBUG "%s: queue %d full\n" ,wiphy_name (ar->hw->wiphy), i); -printk (KERN_DEBUG "%s: stuck frames: ===> \n" , +printk (KERN_DEBUG "%s: stuck frames: ===>\n" ,wiphy_name (ar->hw->wiphy));ar9170_dump_txqueue (ar, &ar->tx_pending[i]);ar9170_dump_txqueue (ar, &ar->tx_status[i]);
drivers/net/wireless/ath/ath9k/debug.c +2 -2
@@ -156,10 +156,10 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,"txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n" , (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17); - len +=snprintf (buf + len,DMA_BUF_LEN - len,"pcu observe: 0x%x \n" , + len +=snprintf (buf + len,DMA_BUF_LEN - len,"pcu observe: 0x%x\n" ,REG_READ_D (ah,AR_OBS_BUS_1 )); len +=snprintf (buf + len,DMA_BUF_LEN - len, -"AR_CR: 0x%x \n" ,REG_READ_D (ah,AR_CR )); +"AR_CR: 0x%x\n" ,REG_READ_D (ah,AR_CR ));ath9k_ps_restore (sc);
drivers/net/wireless/ath/ath9k/eeprom_4k.c +1 -1
@@ -43,7 +43,7 @@ static bool ath9k_hw_4k_fill_eeprom(struct ath_hw *ah)for (addr =0 ; addr <SIZE_EEPROM_4K ; addr++) {if (!ath9k_hw_nvram_read (common, addr + eep_start_loc, eep_data)) {ath_print (common,ATH_DBG_EEPROM , -"Unable to read eeprom region \n" ); +"Unable to read eeprom region\n" );return false; } eep_data++;
drivers/net/wireless/ath/ath9k/eeprom_9287.c +1 -1
@@ -44,7 +44,7 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)if (!ath9k_hw_nvram_read (common, addr + eep_start_loc, eep_data)) {ath_print (common,ATH_DBG_EEPROM , -"Unable to read eeprom region \n" ); +"Unable to read eeprom region\n" );return false; } eep_data++;
drivers/net/wireless/ath/ath9k/gpio.c +1 -1
@@ -364,7 +364,7 @@ static void ath_btcoex_no_stomp_timer(void *arg)bool is_btscan = sc->sc_flags &SC_OP_BT_SCAN ;ath_print (ath9k_hw_common (ah),ATH_DBG_BTCOEX , -"no stomp timer running \n" ); +"no stomp timer running\n" );spin_lock_bh (&btcoex->btcoex_lock);
Signature · 1 line
1.6.6.1
Re: [PATCH 2/7] wireless/ath: remove trailing space in messages
Quoted 2 lines · Frans Pop
Signed-off-by Frans Pop <[email protected]>Cc Luis R. Rodriguez <[email protected]>
thanks but not right now, we have some patches pending which would interference with this.
Luis
PATCH 3/7 wireless/ipw2x00: remove trailing space in messages
In reply to Frans Pop--- drivers/net/wireless/ipw2x00/ipw2100.c | 38 ++++++++-------- drivers/net/wireless/ipw2x00/ipw2200.c | 74 ++++++++++++++++---------------- 2 files changed, 56 insertions(+), 56 deletions(-)
drivers/net/wireless/ipw2x00/ipw2100.c +19 -19
@@ -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 ; }
drivers/net/wireless/ipw2x00/ipw2200.c +37 -37
283 lines not on this page · raw message
Signature · 1 line
1.6.6.1
PATCH 4/7 wireless/iwlwifi: remove trailing space in messages
In reply to Frans PopIncludes minor improvements in debugging messages in iwl-4965.c, function iwl4965_is_temp_calib_needed().
wireless/intel
--- drivers/net/wireless/iwlwifi/iwl-3945.c | 4 ++-- drivers/net/wireless/iwlwifi/iwl-4965.c | 12 ++++++------ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-calib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 6 +++--- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 ++-- drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 2 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 4 ++-- drivers/net/wireless/iwlwifi/iwl-tx.c | 8 ++++---- drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 +++--- 14 files changed, 29 insertions(+), 29 deletions(-)
drivers/net/wireless/iwlwifi/iwl-3945.c +2 -2
@@ -486,7 +486,7 @@ static void _iwl3945_dbg_report_frame(struct iwl_priv *priv,* but you can hack it to show more, if you'd like to. */ if (dataframe)IWL_DEBUG_RX (priv,"%s: mhd=0x%04x, dst=0x%02x, " -"len=%u, rssi=%d, chnl=%d, rate=%d, \n" , +"len=%u, rssi=%d, chnl=%d, rate=%d,\n" , title,le16_to_cpu (fc), header->addr1[5 ], length, rssi, channel, rate);else {
@@ -1049,7 +1049,7 @@ static void iwl3945_nic_config(struct iwl_priv *priv)IWL_DEBUG_INFO (priv,"HW Revision ID = 0x%X\n" , rev_id);if (rev_id &PCI_CFG_REV_ID_BIT_RTP ) -IWL_DEBUG_INFO (priv,"RTP type \n" ); +IWL_DEBUG_INFO (priv,"RTP type\n" );else if (rev_id &PCI_CFG_REV_ID_BIT_BASIC_SKU ) {IWL_DEBUG_INFO (priv,"3945 RADIO-MB type\n" ); iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
drivers/net/wireless/iwlwifi/iwl-4965.c +6 -6
@@ -417,7 +417,7 @@ static void iwl4965_gain_computation(struct iwl_priv *priv, sizeof(cmd), &cmd);if (ret)IWL_DEBUG_CALIB (priv,"fail sending cmd " -"REPLY_PHY_CALIBRATION_CMD \n" ); +"REPLY_PHY_CALIBRATION_CMD\n" );/* TODO we might want recalculate * rx_chain in rxon cmd */
@@ -1619,19 +1619,19 @@ static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv)/* get absolute value */ if (temp_diff <0 ) { -IWL_DEBUG_POWER (priv,"Getting cooler, delta %d, \n" , temp_diff); +IWL_DEBUG_POWER (priv,"Getting cooler, delta %d\n" , temp_diff); temp_diff = -temp_diff; }else if (temp_diff ==0 ) -IWL_DEBUG_POWER (priv,"Same temp, \n" ); +IWL_DEBUG_POWER (priv,"Temperature unchanged\n" );else -IWL_DEBUG_POWER (priv,"Getting warmer, delta %d, \n" , temp_diff); +IWL_DEBUG_POWER (priv,"Getting warmer, delta %d\n" , temp_diff);if (temp_diff <IWL_TEMPERATURE_THRESHOLD ) { -IWL_DEBUG_POWER (priv,"Thermal txpower calib not needed\n" ); +IWL_DEBUG_POWER (priv," => thermal txpower calib not needed\n" );return 0 ; } -IWL_DEBUG_POWER (priv,"Thermal txpower calib needed\n" ); +IWL_DEBUG_POWER (priv," => thermal txpower calib needed\n" );return 1 ; }
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -1
@@ -2004,7 +2004,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,/* rates available for this association, and for modulation mode */ rate_mask =rs_get_supported_rates (lq_sta, hdr, tbl->lq_type); -IWL_DEBUG_RATE (priv,"mask 0x%04X \n" , rate_mask); +IWL_DEBUG_RATE (priv,"mask 0x%04X\n" , rate_mask);/* mask with station rate restriction */ if (is_legacy (tbl->lq_type)) {
drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1
@@ -2271,7 +2271,7 @@ static int iwl_prepare_card_hw(struct iwl_priv *priv) {int ret =0 ; -IWL_DEBUG_INFO (priv,"iwl_prepare_card_hw enter \n" ); +IWL_DEBUG_INFO (priv,"iwl_prepare_card_hw enter\n" ); ret =iwl_set_hw_ready (priv);if (priv->hw_ready)
drivers/net/wireless/iwlwifi/iwl-calib.c +1 -1
@@ -592,7 +592,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,IWL_DEBUG_CALIB (priv,"rx_enable_time = %u usecs\n" , rx_enable_time);if (!rx_enable_time) { -IWL_DEBUG_CALIB (priv,"<< RX Enable Time == 0! \n" ); +IWL_DEBUG_CALIB (priv,"<< RX Enable Time == 0!\n" );return ; }
drivers/net/wireless/iwlwifi/iwl-core.c +3 -3
@@ -444,7 +444,7 @@ void iwl_reset_qos(struct iwl_priv *priv) priv->qos_data.def_qos_parm.ac[i].reserved1 =0 ; } } -IWL_DEBUG_QOS (priv,"set QoS to default \n" ); +IWL_DEBUG_QOS (priv,"set QoS to default\n" );spin_unlock_irqrestore (&priv->lock, flags); }
@@ -2009,7 +2009,7 @@ static void iwl_ht_conf(struct iwl_priv *priv,struct iwl_ht_config *ht_conf = &priv->current_ht_config;struct ieee80211_sta *sta; -IWL_DEBUG_MAC80211 (priv,"enter: \n" ); +IWL_DEBUG_MAC80211 (priv,"enter:\n" );if (!ht_conf->is_ht)return ;
@@ -2567,7 +2567,7 @@ int iwl_alloc_txq_mem(struct iwl_priv *priv)sizeof (struct iwl_tx_queue ) * priv->cfg->num_of_queues, GFP_KERNEL);if (!priv->txq) { -IWL_ERR (priv,"Not enough memory for txq \n" ); +IWL_ERR (priv,"Not enough memory for txq\n" );return -ENOMEM ; }return 0 ;
drivers/net/wireless/iwlwifi/iwl-hcmd.c +2 -2
@@ -169,7 +169,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)mutex_lock (&priv->sync_cmd_mutex);set_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Setting HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Setting HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->id)); cmd_idx =iwl_enqueue_hcmd (priv, cmd);
@@ -191,7 +191,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));clear_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->id)); ret = -ETIMEDOUT ; goto cancel;
drivers/net/wireless/iwlwifi/iwl-io.h +1 -1
@@ -297,7 +297,7 @@ static inline u32 __iwl_read_direct32(const char *f, u32 l, struct iwl_priv *priv, u32 reg) {u32 value =_iwl_read_direct32 (priv, reg); -IWL_DEBUG_IO (priv,"read_direct32(0x%4X) = 0x%08x - %s %d \n" , reg, value, +IWL_DEBUG_IO (priv,"read_direct32(0x%4X) = 0x%08x - %s %d\n" , reg, value, f, l);return value; }
drivers/net/wireless/iwlwifi/iwl-power.c +1 -1
@@ -874,7 +874,7 @@ void iwl_tt_initialize(struct iwl_priv *priv)int size =sizeof (struct iwl_tt_trans ) * (IWL_TI_STATE_MAX -1 );struct iwl_tt_trans *transaction; -IWL_DEBUG_POWER (priv,"Initialize Thermal Throttling \n" ); +IWL_DEBUG_POWER (priv,"Initialize Thermal Throttling\n" );memset (tt,0 ,sizeof (struct iwl_tt_mgmt ));
drivers/net/wireless/iwlwifi/iwl-rx.c +1 -1
@@ -844,7 +844,7 @@ static void iwl_dbg_report_frame(struct iwl_priv *priv,* but you can hack it to show more, if you'd like to. */ if (dataframe)IWL_DEBUG_RX (priv,"%s: mhd=0x%04x, dst=0x%02x, " -"len=%u, rssi=%d, chnl=%d, rate=%u, \n" , +"len=%u, rssi=%d, chnl=%d, rate=%u,\n" , title,le16_to_cpu (fc), header->addr1[5 ], length, rssi, channel, bitrate);else {
drivers/net/wireless/iwlwifi/iwl-scan.c +1 -1
@@ -453,7 +453,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv, added++; } -IWL_DEBUG_SCAN (priv,"total channels to scan %d \n" , added); +IWL_DEBUG_SCAN (priv,"total channels to scan %d\n" , added);return added; }
drivers/net/wireless/iwlwifi/iwl-sta.c +2 -2
@@ -132,7 +132,7 @@ static void iwl_process_add_sta_resp(struct iwl_priv *priv, sta_id);break ;case ADD_STA_MODIFY_NON_EXIST_STA : -IWL_ERR (priv,"Attempting to modify non-existing station %d \n" , +IWL_ERR (priv,"Attempting to modify non-existing station %d\n" , sta_id);break ;default :
@@ -885,7 +885,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, priv->stations[sta_id].sta.mode =STA_CONTROL_MODIFY_MSK ;if (iwl_is_rfkill (priv)) { -IWL_DEBUG_WEP (priv,"Not sending REPLY_ADD_STA command because RFKILL enabled. \n" ); +IWL_DEBUG_WEP (priv,"Not sending REPLY_ADD_STA command because RFKILL enabled.\n" );spin_unlock_irqrestore (&priv->sta_lock, flags);return 0 ; }
drivers/net/wireless/iwlwifi/iwl-tx.c +4 -4
@@ -964,9 +964,9 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) tx_cmd->dram_lsb_ptr =cpu_to_le32 (scratch_phys); tx_cmd->dram_msb_ptr =iwl_get_dma_hi_addr (scratch_phys); -IWL_DEBUG_TX (priv,"sequence nr = 0X%x \n" , +IWL_DEBUG_TX (priv,"sequence nr = 0X%x\n" ,le16_to_cpu (out_cmd->hdr.sequence)); -IWL_DEBUG_TX (priv,"tx_flags = 0X%x \n" ,le32_to_cpu (tx_cmd->tx_flags)); +IWL_DEBUG_TX (priv,"tx_flags = 0X%x\n" ,le32_to_cpu (tx_cmd->tx_flags));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd,sizeof (*tx_cmd));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd->hdr, hdr_len);
@@ -1283,7 +1283,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)if (!(meta->flags &CMD_ASYNC )) {clear_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->hdr.cmd));wake_up_interruptible (&priv->wait_command_queue); }
@@ -1588,7 +1588,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, (unsigned long long )le64_to_cpu (ba_resp->bitmap), ba_resp->scd_flow, ba_resp->scd_ssn); -IWL_DEBUG_TX_REPLY (priv,"DAT start_idx = %d, bitmap = 0x%llx \n" , +IWL_DEBUG_TX_REPLY (priv,"DAT start_idx = %d, bitmap = 0x%llx\n" , agg->start_idx, (unsigned long long )agg->bitmap);
drivers/net/wireless/iwlwifi/iwl3945-base.c +3 -3
@@ -597,9 +597,9 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) txq->need_update =0 ; } -IWL_DEBUG_TX (priv,"sequence nr = 0X%x \n" , +IWL_DEBUG_TX (priv,"sequence nr = 0X%x\n" ,le16_to_cpu (out_cmd->hdr.sequence)); -IWL_DEBUG_TX (priv,"tx_flags = 0X%x \n" ,le32_to_cpu (tx_cmd->tx_flags)); +IWL_DEBUG_TX (priv,"tx_flags = 0X%x\n" ,le32_to_cpu (tx_cmd->tx_flags));iwl_print_hex_dump (priv,IWL_DL_TX , tx_cmd,sizeof (*tx_cmd));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd->hdr,ieee80211_hdrlen (fc));
@@ -1937,7 +1937,7 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv, added++; } -IWL_DEBUG_SCAN (priv,"total channels to scan %d \n" , added); +IWL_DEBUG_SCAN (priv,"total channels to scan %d\n" , added);return added; }
Signature · 1 line
1.6.6.1
Re: [PATCH 4/7] wireless/iwlwifi: remove trailing space in messages
Hi Frans,
Quoted 9 lines · Frans Pop
Includes minor improvements in debugging messages in
iwl-4965.c, functioniwl4965_is_temp_calib_needed().Signed-off-by Frans Pop <[email protected]>Cc Zhu Yi <[email protected]>Cc Reinette Chatre <[email protected]>Cc Intel Linux Wireless <[email protected]>wireless/intel
Since this patch touches so many things, would it be possible to base your patch ongit://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
instead? We currently have some code reorganization pending there that is undergoing validation before we push it upstream. If you do so you can send the patch to me indicating so and I will push it upstream as part of our process to ensure there are no conflicts ahead.
Thank you
Reinette
Re: [PATCH 4/7] wireless/iwlwifi: remove trailing space in messages
Quoted 4 lines · reinette chatre
Since this patch touches so many things, would it be possible to base your patch on
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
instead?
Sure. Which branch?
Re: [PATCH 4/7] wireless/iwlwifi: remove trailing space in messages
Quoted 7 lines · Frans Pop
Quoted 4 lines · reinette chatre
Since this patch touches so many things, would it be possible to base your patch on
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
instead?Sure. Which branch?
master
Thank you very much
Reinette
Re: [PATCH 4/7 v2] wireless/iwlwifi: remove trailing space in messages
In reply to Frans PopIncludes minor improvements in debugging messages in iwl-4965.c, function iwl4965_is_temp_calib_needed().
---
Rebased against and updated for iwlwifi-2.6.git/master as requested by Reinette.
drivers/net/wireless/iwlwifi/iwl-3945-rs.c +1 -1
@@ -341,7 +341,7 @@ void iwl3945_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sstruct ieee80211_supported_band *sband;int i; -IWL_DEBUG_INFO (priv,"enter \n" ); +IWL_DEBUG_INFO (priv,"enter\n" );if (sta_id == priv->hw_params.bcast_sta_id) goto out;
drivers/net/wireless/iwlwifi/iwl-3945.c +2 -2
@@ -486,7 +486,7 @@ static void _iwl3945_dbg_report_frame(struct iwl_priv *priv,* but you can hack it to show more, if you'd like to. */ if (dataframe)IWL_DEBUG_RX (priv,"%s: mhd=0x%04x, dst=0x%02x, " -"len=%u, rssi=%d, chnl=%d, rate=%d, \n" , +"len=%u, rssi=%d, chnl=%d, rate=%d,\n" , title,le16_to_cpu (fc), header->addr1[5 ], length, rssi, channel, rate);else {
@@ -1023,7 +1023,7 @@ static void iwl3945_nic_config(struct iwl_priv *priv)IWL_DEBUG_INFO (priv,"HW Revision ID = 0x%X\n" , rev_id);if (rev_id &PCI_CFG_REV_ID_BIT_RTP ) -IWL_DEBUG_INFO (priv,"RTP type \n" ); +IWL_DEBUG_INFO (priv,"RTP type\n" );else if (rev_id &PCI_CFG_REV_ID_BIT_BASIC_SKU ) {IWL_DEBUG_INFO (priv,"3945 RADIO-MB type\n" ); iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
drivers/net/wireless/iwlwifi/iwl-4965.c +6 -6
@@ -410,7 +410,7 @@ static void iwl4965_gain_computation(struct iwl_priv *priv, sizeof(cmd), &cmd);if (ret)IWL_DEBUG_CALIB (priv,"fail sending cmd " -"REPLY_PHY_CALIBRATION_CMD \n" ); +"REPLY_PHY_CALIBRATION_CMD\n" );/* TODO we might want recalculate * rx_chain in rxon cmd */
@@ -1612,19 +1612,19 @@ static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv)/* get absolute value */ if (temp_diff <0 ) { -IWL_DEBUG_POWER (priv,"Getting cooler, delta %d, \n" , temp_diff); +IWL_DEBUG_POWER (priv,"Getting cooler, delta %d\n" , temp_diff); temp_diff = -temp_diff; }else if (temp_diff ==0 ) -IWL_DEBUG_POWER (priv,"Same temp, \n" ); +IWL_DEBUG_POWER (priv,"Temperature unchanged\n" );else -IWL_DEBUG_POWER (priv,"Getting warmer, delta %d, \n" , temp_diff); +IWL_DEBUG_POWER (priv,"Getting warmer, delta %d\n" , temp_diff);if (temp_diff <IWL_TEMPERATURE_THRESHOLD ) { -IWL_DEBUG_POWER (priv,"Thermal txpower calib not needed\n" ); +IWL_DEBUG_POWER (priv," => thermal txpower calib not needed\n" );return 0 ; } -IWL_DEBUG_POWER (priv,"Thermal txpower calib needed\n" ); +IWL_DEBUG_POWER (priv," => thermal txpower calib needed\n" );return 1 ; }
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1 -1
@@ -854,7 +854,7 @@ static void iwlagn_dbg_report_frame(struct iwl_priv *priv,* but you can hack it to show more, if you'd like to. */ if (dataframe)IWL_DEBUG_RX (priv,"%s: mhd=0x%04x, dst=0x%02x, " -"len=%u, rssi=%d, chnl=%d, rate=%u, \n" , +"len=%u, rssi=%d, chnl=%d, rate=%u,\n" , title,le16_to_cpu (fc), header->addr1[5 ], length, rssi, channel, bitrate);else {
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -1
@@ -2002,7 +2002,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,/* rates available for this association, and for modulation mode */ rate_mask =rs_get_supported_rates (lq_sta, hdr, tbl->lq_type); -IWL_DEBUG_RATE (priv,"mask 0x%04X \n" , rate_mask); +IWL_DEBUG_RATE (priv,"mask 0x%04X\n" , rate_mask);/* mask with station rate restriction */ if (is_legacy (tbl->lq_type)) {
drivers/net/wireless/iwlwifi/iwl-agn-tx.c +3 -3
@@ -723,9 +723,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) tx_cmd->dram_lsb_ptr =cpu_to_le32 (scratch_phys); tx_cmd->dram_msb_ptr =iwl_get_dma_hi_addr (scratch_phys); -IWL_DEBUG_TX (priv,"sequence nr = 0X%x \n" , +IWL_DEBUG_TX (priv,"sequence nr = 0X%x\n" ,le16_to_cpu (out_cmd->hdr.sequence)); -IWL_DEBUG_TX (priv,"tx_flags = 0X%x \n" ,le32_to_cpu (tx_cmd->tx_flags)); +IWL_DEBUG_TX (priv,"tx_flags = 0X%x\n" ,le32_to_cpu (tx_cmd->tx_flags));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd,sizeof (*tx_cmd));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd->hdr, hdr_len);
@@ -1308,7 +1308,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, (unsigned long long )le64_to_cpu (ba_resp->bitmap), ba_resp->scd_flow, ba_resp->scd_ssn); -IWL_DEBUG_TX_REPLY (priv,"DAT start_idx = %d, bitmap = 0x%llx \n" , +IWL_DEBUG_TX_REPLY (priv,"DAT start_idx = %d, bitmap = 0x%llx\n" , agg->start_idx, (unsigned long long )agg->bitmap);
drivers/net/wireless/iwlwifi/iwl-agn.c +3 -3
@@ -181,7 +181,7 @@ int iwl_commit_rxon(struct iwl_priv *priv)IWL_ERR (priv,"Error setting new RXON (%d)\n" , ret);return ret; } -IWL_DEBUG_INFO (priv,"Return from !new_assoc RXON. \n" ); +IWL_DEBUG_INFO (priv,"Return from !new_assoc RXON.\n" );memcpy (active_rxon, &priv->staging_rxon,sizeof (*active_rxon));iwl_clear_ucode_stations (priv, false);iwl_restore_stations (priv);
@@ -2310,7 +2310,7 @@ static int iwl_prepare_card_hw(struct iwl_priv *priv) {int ret =0 ; -IWL_DEBUG_INFO (priv,"iwl_prepare_card_hw enter \n" ); +IWL_DEBUG_INFO (priv,"iwl_prepare_card_hw enter\n" ); ret =iwl_set_hw_ready (priv);if (priv->hw_ready)
@@ -3084,7 +3084,7 @@ static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,iwl_restore_wepkeys (priv);/* Initialize rate scaling */ -IWL_DEBUG_INFO (priv,"Initializing rate scaling for station %pM \n" , +IWL_DEBUG_INFO (priv,"Initializing rate scaling for station %pM\n" , sta->addr);iwl_rs_rate_init (priv, sta, sta_id);
drivers/net/wireless/iwlwifi/iwl-calib.c +1 -1
@@ -592,7 +592,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,IWL_DEBUG_CALIB (priv,"rx_enable_time = %u usecs\n" , rx_enable_time);if (!rx_enable_time) { -IWL_DEBUG_CALIB (priv,"<< RX Enable Time == 0! \n" ); +IWL_DEBUG_CALIB (priv,"<< RX Enable Time == 0!\n" );return ; }
drivers/net/wireless/iwlwifi/iwl-core.c +3 -3
@@ -348,7 +348,7 @@ void iwl_reset_qos(struct iwl_priv *priv) priv->qos_data.def_qos_parm.ac[i].reserved1 =0 ; } } -IWL_DEBUG_QOS (priv,"set QoS to default \n" ); +IWL_DEBUG_QOS (priv,"set QoS to default\n" );spin_unlock_irqrestore (&priv->lock, flags); }
@@ -1914,7 +1914,7 @@ static void iwl_ht_conf(struct iwl_priv *priv,struct iwl_ht_config *ht_conf = &priv->current_ht_config;struct ieee80211_sta *sta; -IWL_DEBUG_MAC80211 (priv,"enter: \n" ); +IWL_DEBUG_MAC80211 (priv,"enter:\n" );if (!ht_conf->is_ht)return ;
@@ -2475,7 +2475,7 @@ int iwl_alloc_txq_mem(struct iwl_priv *priv)sizeof (struct iwl_tx_queue ) * priv->cfg->num_of_queues, GFP_KERNEL);if (!priv->txq) { -IWL_ERR (priv,"Not enough memory for txq \n" ); +IWL_ERR (priv,"Not enough memory for txq\n" );return -ENOMEM ; }return 0 ;
drivers/net/wireless/iwlwifi/iwl-hcmd.c +2 -2
@@ -169,7 +169,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)mutex_lock (&priv->sync_cmd_mutex);set_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Setting HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Setting HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->id)); cmd_idx =iwl_enqueue_hcmd (priv, cmd);
@@ -191,7 +191,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));clear_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->id)); ret = -ETIMEDOUT ; goto cancel;
drivers/net/wireless/iwlwifi/iwl-io.h +1 -1
@@ -297,7 +297,7 @@ static inline u32 __iwl_read_direct32(const char *f, u32 l, struct iwl_priv *priv, u32 reg) {u32 value =_iwl_read_direct32 (priv, reg); -IWL_DEBUG_IO (priv,"read_direct32(0x%4X) = 0x%08x - %s %d \n" , reg, value, +IWL_DEBUG_IO (priv,"read_direct32(0x%4X) = 0x%08x - %s %d\n" , reg, value, f, l);return value; }
drivers/net/wireless/iwlwifi/iwl-power.c +1 -1
@@ -874,7 +874,7 @@ void iwl_tt_initialize(struct iwl_priv *priv)int size =sizeof (struct iwl_tt_trans ) * (IWL_TI_STATE_MAX -1 );struct iwl_tt_trans *transaction; -IWL_DEBUG_POWER (priv,"Initialize Thermal Throttling \n" ); +IWL_DEBUG_POWER (priv,"Initialize Thermal Throttling\n" );memset (tt,0 ,sizeof (struct iwl_tt_mgmt ));
drivers/net/wireless/iwlwifi/iwl-scan.c +1 -1
@@ -453,7 +453,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv, added++; } -IWL_DEBUG_SCAN (priv,"total channels to scan %d \n" , added); +IWL_DEBUG_SCAN (priv,"total channels to scan %d\n" , added);return added; }
drivers/net/wireless/iwlwifi/iwl-sta.c +6 -6
@@ -71,7 +71,7 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr) (!(priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) || ((priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) && (priv->stations[ret].used & IWL_STA_UCODE_INPROGRESS)))) { -IWL_ERR (priv,"Requested station info for sta %d before ready. \n" , +IWL_ERR (priv,"Requested station info for sta %d before ready.\n" , ret); ret =IWL_INVALID_STATION ; }
@@ -143,7 +143,7 @@ static void iwl_process_add_sta_resp(struct iwl_priv *priv, sta_id);break ;case ADD_STA_MODIFY_NON_EXIST_STA : -IWL_ERR (priv,"Attempting to modify non-existing station %d \n" , +IWL_ERR (priv,"Attempting to modify non-existing station %d\n" , sta_id);break ;default :
@@ -574,7 +574,7 @@ static int iwl_remove_station(struct iwl_priv *priv, struct ieee80211_sta *sta)if (!iwl_is_ready (priv)) {IWL_DEBUG_INFO (priv, -"Unable to remove station %pM, device not ready. \n" , +"Unable to remove station %pM, device not ready.\n" , sta->addr);/* * It is typical for stations to be removed when we are
@@ -671,7 +671,7 @@ void iwl_clear_ucode_stations(struct iwl_priv *priv, bool force) }else {for (i =0 ; i < priv->hw_params.max_stations; i++) {if (priv->stations[i].used &IWL_STA_UCODE_ACTIVE ) { -IWL_DEBUG_INFO (priv,"Clearing ucode active for station %d \n" , i); +IWL_DEBUG_INFO (priv,"Clearing ucode active for station %d\n" , i); priv->stations[i].used &= ~IWL_STA_UCODE_ACTIVE ; cleared = true; }
@@ -1108,7 +1108,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, priv->stations[sta_id].sta.mode =STA_CONTROL_MODIFY_MSK ;if (iwl_is_rfkill (priv)) { -IWL_DEBUG_WEP (priv,"Not sending REPLY_ADD_STA command because RFKILL enabled. \n" ); +IWL_DEBUG_WEP (priv,"Not sending REPLY_ADD_STA command because RFKILL enabled.\n" );spin_unlock_irqrestore (&priv->sta_lock, flags);return 0 ; }
@@ -1210,7 +1210,7 @@ int iwl_send_lq_cmd(struct iwl_priv *priv,return ret;if (init) { -IWL_DEBUG_INFO (priv,"init LQ command complete, clearing sta addition status for sta %d \n" , +IWL_DEBUG_INFO (priv,"init LQ command complete, clearing sta addition status for sta %d\n" , lq->sta_id);spin_lock_irqsave (&priv->sta_lock, flags_spin); priv->stations[lq->sta_id].used &= ~IWL_STA_UCODE_INPROGRESS ;
drivers/net/wireless/iwlwifi/iwl-tx.c +1 -1
@@ -640,7 +640,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)if (!(meta->flags &CMD_ASYNC )) {clear_bit (STATUS_HCMD_ACTIVE , &priv->status); -IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s \n" , +IWL_DEBUG_INFO (priv,"Clearing HCMD_ACTIVE for command %s\n" ,get_cmd_string (cmd->hdr.cmd));wake_up_interruptible (&priv->wait_command_queue); }
drivers/net/wireless/iwlwifi/iwl3945-base.c +4 -4
@@ -597,9 +597,9 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) txq->need_update =0 ; } -IWL_DEBUG_TX (priv,"sequence nr = 0X%x \n" , +IWL_DEBUG_TX (priv,"sequence nr = 0X%x\n" ,le16_to_cpu (out_cmd->hdr.sequence)); -IWL_DEBUG_TX (priv,"tx_flags = 0X%x \n" ,le32_to_cpu (tx_cmd->tx_flags)); +IWL_DEBUG_TX (priv,"tx_flags = 0X%x\n" ,le32_to_cpu (tx_cmd->tx_flags));iwl_print_hex_dump (priv,IWL_DL_TX , tx_cmd,sizeof (*tx_cmd));iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd->hdr,ieee80211_hdrlen (fc));
@@ -1937,7 +1937,7 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv, added++; } -IWL_DEBUG_SCAN (priv,"total channels to scan %d \n" , added); +IWL_DEBUG_SCAN (priv,"total channels to scan %d\n" , added);return added; }
@@ -3403,7 +3403,7 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw, }/* Initialize rate scaling */ -IWL_DEBUG_INFO (priv,"Initializing rate scaling for station %pM \n" , +IWL_DEBUG_INFO (priv,"Initializing rate scaling for station %pM\n" , sta->addr);iwl3945_rs_rate_init (priv, sta, sta_id);
Re: [PATCH 4/7 v2] wireless/iwlwifi: remove trailing space in messages
Quoted 12 lines · Frans Pop
Includes minor improvements in debugging messages in
iwl-4965.c, functioniwl4965_is_temp_calib_needed().Signed-off-by Frans Pop <elendil-EIBgga6/0yRmR6Xm/[email protected]>Cc Zhu Yi <[email protected]>Cc Reinette Chatre <[email protected]>Cc Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]>---
Rebased against and updated for iwlwifi-2.6.git/master as requested by Reinette.
John, I'll take this patch and submit it as part of our regular process.
Reinette
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 5/7 wireless/prism54: remove trailing space in messages
In reply to Frans Pop--- drivers/net/wireless/p54/txrx.c | 2 +- drivers/net/wireless/prism54/islpci_dev.c | 16 ++++++++-------- drivers/net/wireless/prism54/islpci_eth.c | 8 ++++---- drivers/net/wireless/prism54/islpci_mgt.c | 8 ++++---- drivers/net/wireless/prism54/oid_mgt.c | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/wireless/p54/txrx.c +1 -1
@@ -38,7 +38,7 @@ static void p54_dump_tx_queue(struct p54_common *priv)u32 largest_hole =0 , free;spin_lock_irqsave (&priv->tx_queue.lock, flags); -printk (KERN_DEBUG "%s: / --- tx queue dump (%d entries) --- \n" , +printk (KERN_DEBUG "%s: / --- tx queue dump (%d entries) ---\n" ,wiphy_name (priv->hw->wiphy),skb_queue_len (&priv->tx_queue)); prev_addr = priv->rx_start;
drivers/net/wireless/prism54/islpci_dev.c +8 -8
@@ -227,14 +227,14 @@ islpci_interrupt(int irq, void *config)#if VERBOSE >SHOW_ERROR_MESSAGES DEBUG (SHOW_FUNCTION_CALLS , -"IRQ: Identification register 0x%p 0x%x \n" , device, reg); +"IRQ: Identification register 0x%p 0x%x\n" , device, reg);#endif /* check for each bit in the register separately */ if (reg &ISL38XX_INT_IDENT_UPDATE ) {#if VERBOSE >SHOW_ERROR_MESSAGES /* Queue has been updated */ -DEBUG (SHOW_TRACING ,"IRQ: Update flag \n" ); +DEBUG (SHOW_TRACING ,"IRQ: Update flag\n" ); DEBUG(SHOW_QUEUE_INDEXES, "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n",
@@ -300,7 +300,7 @@ islpci_interrupt(int irq, void *config) ISL38XX_CB_RX_DATA_LQ) != 0) {#if VERBOSE >SHOW_ERROR_MESSAGES DEBUG (SHOW_TRACING , -"Received frame in Data Low Queue \n" ); +"Received frame in Data Low Queue\n" );#endif islpci_eth_receive (priv); }
@@ -325,7 +325,7 @@ islpci_interrupt(int irq, void *config)/* Device has been initialized */ #if VERBOSE >SHOW_ERROR_MESSAGES DEBUG (SHOW_TRACING , -"IRQ: Init flag, device initialized \n" ); +"IRQ: Init flag, device initialized\n" );#endif wake_up (&priv->reset_done); }
@@ -333,7 +333,7 @@ islpci_interrupt(int irq, void *config)if (reg &ISL38XX_INT_IDENT_SLEEP ) {/* Device intends to move to powersave state */ #if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_TRACING ,"IRQ: Sleep flag \n" ); +DEBUG (SHOW_TRACING ,"IRQ: Sleep flag\n" );#endif isl38xx_handle_sleep_request(priv->control_block, &powerstate,
@@ -343,7 +343,7 @@ islpci_interrupt(int irq, void *config)if (reg &ISL38XX_INT_IDENT_WAKEUP ) {/* Device has been woken up to active state */ #if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_TRACING ,"IRQ: Wakeup flag \n" ); +DEBUG (SHOW_TRACING ,"IRQ: Wakeup flag\n" );#endif isl38xx_handle_wakeup(priv->control_block,
@@ -634,7 +634,7 @@ islpci_alloc_memory(islpci_private *priv) ioremap(pci_resource_start(priv->pdev, 0), ISL38XX_PCI_MEM_SIZE))) {/* error in remapping the PCI device memory address range */ -printk (KERN_ERR "PCI memory remapping failed \n" ); +printk (KERN_ERR "PCI memory remapping failed\n" );return -1 ; }
@@ -901,7 +901,7 @@ islpci_setup(struct pci_dev *pdev)if (register_netdev (ndev)) {DEBUG (SHOW_ERROR_MESSAGES , -"ERROR: register_netdev() failed \n" ); +"ERROR: register_netdev() failed\n" ); goto do_islpci_free_memory; }
drivers/net/wireless/prism54/islpci_eth.c +4 -4
@@ -89,7 +89,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)u32 curr_frag;#if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_FUNCTION_CALLS ,"islpci_eth_transmit \n" ); +DEBUG (SHOW_FUNCTION_CALLS ,"islpci_eth_transmit\n" );#endif /* lock the driver code */
@@ -140,7 +140,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) }#if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_TRACING ,"memmove %p %p %i \n" , skb->data, +DEBUG (SHOW_TRACING ,"memmove %p %p %i\n" , skb->data, src, skb->len);#endif }else {
@@ -319,7 +319,7 @@ islpci_eth_receive(islpci_private *priv)int discard =0 ;#if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_FUNCTION_CALLS ,"islpci_eth_receive \n" ); +DEBUG (SHOW_FUNCTION_CALLS ,"islpci_eth_receive\n" );#endif /* the device has written an Ethernet frame in the data area
@@ -431,7 +431,7 @@ islpci_eth_receive(islpci_private *priv) skb =dev_alloc_skb (MAX_FRAGMENT_SIZE_RX +2 );if (unlikely (skb ==NULL )) {/* error allocating an sk_buff structure elements */ -DEBUG (SHOW_ERROR_MESSAGES ,"Error allocating skb \n" ); +DEBUG (SHOW_ERROR_MESSAGES ,"Error allocating skb\n" );break ; }skb_reserve (skb, (4 - (long ) skb->data) &0x03 );
drivers/net/wireless/prism54/islpci_mgt.c +4 -4
@@ -113,7 +113,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev)u32 curr =le32_to_cpu (cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ ]);#if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_FUNCTION_CALLS ,"islpci_mgmt_rx_fill \n" ); +DEBUG (SHOW_FUNCTION_CALLS ,"islpci_mgmt_rx_fill\n" );#endif while (curr - priv->index_mgmt_rx <ISL38XX_CB_MGMT_QSIZE ) {
@@ -211,7 +211,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid, {pimfor_header_t *h = buf.mem;DEBUG (SHOW_PIMFOR_FRAMES , -"PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x \n" , +"PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n" , h->operation, oid, h->device_id, h->flags, length);/* display the buffer contents for debugging */
@@ -279,7 +279,7 @@ islpci_mgt_receive(struct net_device *ndev)u32 curr_frag;#if VERBOSE >SHOW_ERROR_MESSAGES -DEBUG (SHOW_FUNCTION_CALLS ,"islpci_mgt_receive \n" ); +DEBUG (SHOW_FUNCTION_CALLS ,"islpci_mgt_receive\n" );#endif /* Only once per interrupt, determine fragment range to
@@ -338,7 +338,7 @@ islpci_mgt_receive(struct net_device *ndev)#if VERBOSE >SHOW_ERROR_MESSAGES DEBUG (SHOW_PIMFOR_FRAMES , -"PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x \n" , +"PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n" , header->operation, header->oid, header->device_id, header->flags, header->length);
drivers/net/wireless/prism54/oid_mgt.c +1 -1
@@ -819,7 +819,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) k =snprintf (str,PRIV_STR_SIZE ,"nr=%u\n" , list->nr);for (i =0 ; i < list->nr; i++) k += snprintf(str + k, PRIV_STR_SIZE - k, - "bss[%u] : \nage=%u\nchannel=%u\n" + "bss[%u] :\nage=%u\nchannel=%u\n" "capinfo=0x%X\nrates=0x%X\n" "basic_rates=0x%X\n", i, list->bsslist[i].age,
Signature · 1 line
1.6.6.1
PATCH 6/7 wireless/raylink: remove trailing space in messages
In reply to Frans Pop--- drivers/net/wireless/ray_cs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/ray_cs.c +6 -6
@@ -556,7 +556,7 @@ static int ray_init(struct net_device *dev) local->fw_ver = local->startup_res.firmware_version[0 ]; local->fw_bld = local->startup_res.firmware_version[1 ]; local->fw_var = local->startup_res.firmware_version[2 ]; -dev_dbg (&link->dev,"ray_init firmware version %d.%d \n" , local->fw_ver, +dev_dbg (&link->dev,"ray_init firmware version %d.%d\n" , local->fw_ver, local->fw_bld); local->tib_length =0x20 ;
@@ -2252,7 +2252,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + FCS_LEN)) {pr_debug ( -"ray_cs invalid packet length %d received \n" , +"ray_cs invalid packet length %d received\n" , rx_len);return ; }
@@ -2263,7 +2263,7 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + FCS_LEN)) {pr_debug ( -"ray_cs invalid packet length %d received \n" , +"ray_cs invalid packet length %d received\n" , rx_len);return ; }
@@ -2771,11 +2771,11 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)seq_printf (m,"Hop dwell = %d Kus\n" , pfh->dwell_time[0 ] +256 * pfh->dwell_time[1 ]); -seq_printf (m,"Hop set = %d \n" , +seq_printf (m,"Hop set = %d\n" , pfh->hop_set); -seq_printf (m,"Hop pattern = %d \n" , +seq_printf (m,"Hop pattern = %d\n" , pfh->hop_pattern); -seq_printf (m,"Hop index = %d \n" , +seq_printf (m,"Hop index = %d\n" , pfh->hop_index); p += p[1 ] +2 ; }else {
Signature · 1 line
1.6.6.1
PATCH 7/7 wireless/libertas: remove trailing space in debugfs header
In reply to Frans Pop--- drivers/net/wireless/libertas/debugfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/libertas/debugfs.c +1 -1
@@ -74,7 +74,7 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,return -ENOMEM ; pos +=snprintf (buf+pos, len-pos, -"# | ch | rssi | bssid | cap | Qual | SSID \n" ); +"# | ch | rssi | bssid | cap | Qual | SSID\n" );mutex_lock (&priv->lock); list_for_each_entry (iter_bss, &priv->network_list, list) {
Signature · 1 line
1.6.6.1
David Miller
maintainerFrom: Frans Pop <[email protected]>
Date: Wed, 24 Mar 2010 19:27:09 +0100
Quoted 7 lines
This is the third patchset to remove trailing spaces in kernel messages. Patches in this set cover wireless code.
Note that the last patch for libertas changes a debugfs header and not actually a message.
Patches have been rebased against current net-next.
John, please suck these in :-)