lkml.org 
[lkml]   [2010]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] wireless/iwlwifi: remove trailing space in messages
    Date
    Includes minor improvements in debugging messages in iwl-4965.c,
    function iwl4965_is_temp_calib_needed().

    Signed-off-by: Frans Pop <elendil@planet.nl>
    Cc: Zhu Yi <yi.zhu@intel.com>
    Cc: Reinette Chatre <reinette.chatre@intel.com>
    Cc: Intel Linux Wireless <ilw@linux.intel.com>

    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(-)

    diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
    index 12a42fc..e3e5399 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
    @@ -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,
    diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
    index 644aacf..ee85e5a 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
    @@ -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;
    }
    diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
    index 84271cc..eebc32c 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
    @@ -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)) {
    diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
    index efee4e3..5438956 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
    @@ -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)
    diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
    index 845831a..dbb50a8 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-calib.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
    @@ -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;
    }

    diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
    index ec435e5..cb2149f 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-core.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
    @@ -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;
    diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
    index 73681c4..51f89e7 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
    @@ -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;
    diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
    index c719baf..4f54a5f 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-io.h
    +++ b/drivers/net/wireless/iwlwifi/iwl-io.h
    @@ -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;
    }
    diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
    index 1a1a9f0..21222c6 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-power.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-power.c
    @@ -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));

    diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
    index 8116aa0..7db6c41 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
    @@ -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 {
    diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
    index 84b19b1..8d414ac 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-scan.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
    @@ -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;
    }

    diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
    index b1aad30..0457d93 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-sta.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
    @@ -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;
    }
    diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
    index d6222aa..c4fc552 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-tx.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
    @@ -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);

    diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
    index 2579bbc..c21a498 100644
    --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
    +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
    @@ -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;
    }

    --
    1.6.6.1


    \
     
     \ /
      Last update: 2010-03-24 19:49    [W:0.038 / U:32.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site