drivers/net: Fix various unnecessary characters after logging newlines

Remove and coalesce formats when there is an unnecessary
character after a logging newline.  These extra characters
cause logging defects.

Miscellanea:

o Coalesce formats

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index e500528..8a815bb 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1766,7 +1766,7 @@ static int load_firmware(struct octeon_device *oct)
 
        ret = request_firmware(&fw, fw_name, &oct->pci_dev->dev);
        if (ret) {
-               dev_err(&oct->pci_dev->dev, "Request firmware failed. Could not find file %s.\n.",
+               dev_err(&oct->pci_dev->dev, "Request firmware failed. Could not find file %s.\n",
                        fw_name);
                release_firmware(fw);
                return ret;

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 6cec2a6..7503aa2 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -146,8 +146,7 @@ netxen_get_minidump_template(struct netxen_adapter *adapter)
        if ((cmd.rsp.cmd == NX_RCODE_SUCCESS) && (size == cmd.rsp.arg2)) {
                memcpy(adapter->mdump.md_template, addr, size);
        } else {
-               dev_err(&adapter->pdev->dev, "Failed to get minidump template, "
-                       "err_code : %d, requested_size : %d, actual_size : %d\n ",
+               dev_err(&adapter->pdev->dev, "Failed to get minidump template, err_code : %d, requested_size : %d, actual_size : %d\n",
                        cmd.rsp.cmd, size, cmd.rsp.arg2);
        }
        pci_free_consistent(adapter->pdev, size, addr, md_template_addr);
@@ -180,8 +179,7 @@ netxen_setup_minidump(struct netxen_adapter *adapter)
                if ((err == NX_RCODE_CMD_INVALID) ||
                        (err == NX_RCODE_CMD_NOT_IMPL)) {
                        dev_info(&adapter->pdev->dev,
-                               "Flashed firmware version does not support minidump, "
-                               "minimum version required is [ %u.%u.%u ].\n ",
+                               "Flashed firmware version does not support minidump, minimum version required is [ %u.%u.%u ]\n",
                                NX_MD_SUPPORT_MAJOR, NX_MD_SUPPORT_MINOR,
                                NX_MD_SUPPORT_SUBVERSION);
                }

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 5605289..fde20fd 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1098,7 +1098,7 @@ int qed_final_cleanup(struct qed_hwfn *p_hwfn,
        }
 
        DP_VERBOSE(p_hwfn, QED_MSG_IOV,
-                  "Sending final cleanup for PFVF[%d] [Command %08x\n]",
+                  "Sending final cleanup for PFVF[%d] [Command %08x]\n",
                   id, command);
 
        qed_wr(p_hwfn, p_ptt, XSDM_REG_OPERATION_GEN, command);

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 8293c20..70de062 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2211,7 +2211,7 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
        while (prod != rx_ring->cnsmr_idx) {
 
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
-                            "cq_id = %d, prod = %d, cnsmr = %d.\n.",
+                            "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
 
                net_rsp = (struct ob_mac_iocb_rsp *)rx_ring->curr_entry;
@@ -2258,7 +2258,7 @@ static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget)
        while (prod != rx_ring->cnsmr_idx) {
 
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
-                            "cq_id = %d, prod = %d, cnsmr = %d.\n.",
+                            "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
 
                net_rsp = rx_ring->curr_entry;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index f5b405c..b6122aa 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1264,7 +1264,7 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
        brcmf_dbg(TRACE, "Enter\n");
 
        if (test_and_clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state)) {
-               brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n ");
+               brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n");
                err = brcmf_fil_cmd_data_set(vif->ifp,
                                             BRCMF_C_DISASSOC, NULL, 0);
                if (err) {

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index ba3fb1d..f26beeb 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -7557,8 +7557,7 @@ static int ipw_associate(void *data)
        }
 
        if (priv->status & STATUS_DISASSOCIATING) {
-               IPW_DEBUG_ASSOC("Not attempting association (in "
-                               "disassociating)\n ");
+               IPW_DEBUG_ASSOC("Not attempting association (in disassociating)\n");
                schedule_work(&priv->associate);
                return 0;
        }

diff --git a/drivers/net/wireless/intersil/prism54/islpci_eth.c b/drivers/net/wireless/intersil/prism54/islpci_eth.c
index 9b0ded7..b277113 100644 (file)
--- a/drivers/net/wireless/intersil/prism54/islpci_eth.c
+++ b/drivers/net/wireless/intersil/prism54/islpci_eth.c
@@ -57,7 +57,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv,
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
                        DEBUG(SHOW_TRACING,
-                             "cleanup skb %p skb->data %p skb->len %u truesize %u\n ",
+                             "cleanup skb %p skb->data %p skb->len %u truesize %u\n",
                              skb, skb->data, skb->len, skb->truesize);
 #endif
 
@@ -328,7 +328,7 @@ islpci_eth_receive(islpci_private *priv)
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
        DEBUG(SHOW_TRACING,
-             "frq->addr %x skb->data %p skb->len %u offset %u truesize %u\n ",
+             "frq->addr %x skb->data %p skb->len %u offset %u truesize %u\n",
              control_block->rx_data_low[priv->free_data_rx].address, skb->data,
              skb->len, offset, skb->truesize);
 #endif
@@ -436,7 +436,7 @@ islpci_eth_receive(islpci_private *priv)
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
                DEBUG(SHOW_TRACING,
-                     "new alloc skb %p skb->data %p skb->len %u index %u truesize %u\n ",
+                     "new alloc skb %p skb->data %p skb->len %u index %u truesize %u\n",
                      skb, skb->data, skb->len, index, skb->truesize);
 #endif
 

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index 38b2ba1..380e86f 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1267,8 +1267,8 @@ static void rtl8192eu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
                reg_ecc = result[candidate][7];
                dev_dbg(dev, "%s: candidate is %x\n", __func__, candidate);
                dev_dbg(dev,
-                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x "
-                       "ecc=%x\n ", __func__, reg_e94, reg_e9c,
+                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x ecc=%x\n",
+                       __func__, reg_e94, reg_e9c,
                        reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc);
                path_a_ok = true;
                path_b_ok = true;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
index c4b86a8..26b674a 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
@@ -1175,8 +1175,8 @@ static void rtl8723bu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
                reg_ecc = result[candidate][7];
                dev_dbg(dev, "%s: candidate is %x\n", __func__, candidate);
                dev_dbg(dev,
-                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x "
-                       "ecc=%x\n ", __func__, reg_e94, reg_e9c,
+                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x ecc=%x\n",
+                       __func__, reg_e94, reg_e9c,
                        reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc);
                path_a_ok = true;
                path_b_ok = true;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 718a73c..505ab1b 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -3406,8 +3406,8 @@ void rtl8xxxu_gen1_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
                reg_ecc = result[candidate][7];
                dev_dbg(dev, "%s: candidate is %x\n", __func__, candidate);
                dev_dbg(dev,
-                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x "
-                       "ecc=%x\n ", __func__, reg_e94, reg_e9c,
+                       "%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x ecc=%x\n",
+                       __func__, reg_e94, reg_e9c,
                        reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc);
                path_a_ok = true;
                path_b_ok = true;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
index 9111ba7..3be8c88 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
@@ -2642,7 +2642,7 @@ static void rtl8821ae_dm_edca_choose_traffic_idx(
                if (cur_tx_bytes > (cur_rx_bytes*4)) {
                        *pb_is_cur_rdl_state = false;
                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
-                                "Uplink Traffic\n ");
+                                "Uplink Traffic\n");
                } else {
                        *pb_is_cur_rdl_state = true;
                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,