[PATCH net-next v5 2/6] lib8390: Replace pr_cont() with SMP-safe construct

[Armin Wolf]

Replace pr_cont() with SMP-safe construct.

Signed-off-by: Armin Wolf <w_ar...@gmx.de>
---
 drivers/net/ethernet/8390/lib8390.c | 31 +++++++++++------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/8390/lib8390.c 
b/drivers/net/ethernet/8390/lib8390.c
index 3a2b1e33a47a..e8a323352c40 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -518,25 +518,18 @@ static void ei_tx_err(struct net_device *dev)
 {
        unsigned long e8390_base = dev->base_addr;
        /* ei_local is used on some platforms via the EI_SHIFT macro */
-       struct ei_device *ei_local __maybe_unused = netdev_priv(dev);
-       unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
-       unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
-
-#ifdef VERBOSE_ERROR_DUMP
-       netdev_dbg(dev, "transmitter error (%#2x):", txsr);
-       if (txsr & ENTSR_ABT)
-               pr_cont(" excess-collisions ");
-       if (txsr & ENTSR_ND)
-               pr_cont(" non-deferral ");
-       if (txsr & ENTSR_CRS)
-               pr_cont(" lost-carrier ");
-       if (txsr & ENTSR_FU)
-               pr_cont(" FIFO-underrun ");
-       if (txsr & ENTSR_CDH)
-               pr_cont(" lost-heartbeat ");
-       pr_cont("\n");
-#endif
-
+       struct ei_device *ei_local = netdev_priv(dev);
+       unsigned char txsr = ei_inb_p(e8390_base + EN0_TSR);
+       unsigned char tx_was_aborted = txsr & (ENTSR_ABT + ENTSR_FU);
+
+       if (netif_msg_tx_err(ei_local)) {
+               netdev_err(dev, "Transmitter error %#2x ( %s%s%s%s%s)", txsr,
+                          (txsr & ENTSR_ABT) ? "excess-collisions " : "",
+                          (txsr & ENTSR_ND) ? "non-deferral " : "",
+                          (txsr & ENTSR_CRS) ? "lost-carrier " : "",
+                          (txsr & ENTSR_FU) ? "FIFO-underrun " : "",
+                          (txsr & ENTSR_CDH) ? "lost-heartbeat " : "");
+       }
        ei_outb_p(ENISR_TX_ERR, e8390_base + EN0_ISR); /* Ack intr. */
        if (tx_was_aborted) {
                ei_tx_intr(dev);
--
2.20.1