Use if_printf(ifp, "blah") instead of

printf("%s%d: blah", ifp->if_name, ifp->if_unit).

1 files changed, 15 insertions, 22 deletions

diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 942be00..ed4bdc9 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -346,10 +346,9 @@ le_attach(
     dvp->id_ointr = le_intr;
     ifp->if_softc = sc;
     ifp->if_mtu = ETHERMTU;
-    printf("%s%d: %s ethernet address %6D\n",
-	   ifp->if_name, ifp->if_unit,
-	   sc->le_prodname,
-	   sc->le_ac.ac_enaddr, ":");
+    if_printf(ifp, "%s ethernet address %6D\n",
+	sc->le_prodname,
+	sc->le_ac.ac_enaddr, ":");
 
     ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
     ifp->if_output = ether_output;
@@ -687,8 +686,9 @@ lemac_probe(
      */
 
     if (irq != sc->le_irq) {
-	printf("%s%d: lemac configuration error: expected IRQ 0x%x actual 0x%x\n",
-	       sc->le_if.if_name, sc->le_if.if_unit, sc->le_irq, irq);
+	if_printf(&sc->le_if,
+	    "lemac configuration error: expected IRQ 0x%x actual 0x%x\n",
+	    sc->le_irq, irq);
 	return 0;
     }
 
@@ -707,9 +707,9 @@ lemac_probe(
      *  Check for correct memory base configuration.
      */
     if (vtophys(sc->le_membase) != sc->lemac_membase) {
-	printf("%s%d: lemac configuration error: expected iomem 0x%x actual 0x%x\n",
-	       sc->le_if.if_name, sc->le_if.if_unit,
-	       vtophys(sc->le_membase), sc->lemac_membase);
+	if_printf(&sc->le_if,
+	    "lemac configuration error: expected iomem 0x%x actual 0x%x\n",
+	    vtophys(sc->le_membase), sc->lemac_membase);
 	return 0;
     }
 
@@ -752,8 +752,7 @@ lemac_reset(
      * read from the EEPROM.
      */
     if ((cksum = lemac_read_eeprom(sc)) != LEMAC_EEP_CKSUM) {
-	printf("%s%d: reset: EEPROM checksum failed (0x%x)\n",
-	       sc->le_if.if_name, sc->le_if.if_unit, cksum);
+	if_printf(&sc->le_if, "reset: EEPROM checksum failed (0x%x)\n", cksum);
 	return;
     }
 
@@ -948,8 +947,7 @@ lemac_rxd_intr(
     if ((LE_INB(sc, LEMAC_REG_CS) & LEMAC_CS_RXD) == 0)
 	return;
 
-    printf("%s%d: fatal RXD error, attempting recovery\n",
-	   sc->le_if.if_name, sc->le_if.if_unit);
+    if_printf(&sc->le_if, "fatal RXD error, attempting recovery\n");
 
     sc->if_reset(sc);
     if (sc->le_flags & IFF_UP) {
@@ -960,8 +958,7 @@ lemac_rxd_intr(
     /*
      *  Error during initializion.  Mark card as disabled.
      */
-    printf("%s%d: recovery failed -- board disabled\n",
-	   sc->le_if.if_name, sc->le_if.if_unit);
+    if_printf(&sc->le_if, "recovery failed -- board disabled\n");
     return;
 }
 
@@ -1511,9 +1508,7 @@ lance_dumpcsrs(
     le_softc_t *sc,
     const char *id)
 {
-    printf("%s%d: %s: nicsr=%04x",
-	   sc->le_if.if_name, sc->le_if.if_unit,
-	   id, DEPCA_RDNICSR(sc));
+    if_printf(&sc->le_if, "%s: nicsr=%04x", id, DEPCA_RDNICSR(sc));
     LN_SELCSR(sc, LN_CSR0); printf(" csr0=%04x", LN_RDCSR(sc));
     LN_SELCSR(sc, LN_CSR1); printf(" csr1=%04x", LN_RDCSR(sc));
     LN_SELCSR(sc, LN_CSR2); printf(" csr2=%04x", LN_RDCSR(sc));
@@ -1703,8 +1698,7 @@ lance_intr(
     }
 
     if (oldcsr == (LN_CSR0_PENDINTR|LN_CSR0_RXON|LN_CSR0_TXON))
-        printf("%s%d: lance_intr: stray interrupt\n",
-	       sc->le_if.if_name, sc->le_if.if_unit);
+        if_printf(&sc->le_if, "lance_intr: stray interrupt\n");
 }
 
 static int
@@ -1953,8 +1947,7 @@ lance_tx_intr(
 		    LN_STAT(tx_excessive_collisions++);
 		    if ((tdr = (desc.d_status & LN_DSTS_TxTDRMASK)) > 0) {
 			tdr *= 100;
-			printf("%s%d: lance: warning: excessive collisions: TDR %dns (%d-%dm)\n",
-			       sc->le_if.if_name, sc->le_if.if_unit,
+			if_printf(&sc->le_if, "lance: warning: excessive collisions: TDR %dns (%d-%dm)\n",
 			       tdr, (tdr*99)/1000, (tdr*117)/1000);
 		    }
 		}