make various strings ("can't map mem space" and similar) more consistent

between instances, saving space in the kernel. feedback from many (some
incorporated, some left for future work).

ok deraadt, kettenis, "why not" miod.

1 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 3ae57311243..4400755118a 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.84 2009/01/26 19:09:41 damien Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.85 2009/03/29 21:53:52 sthen Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -179,7 +179,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
 	error = pci_mapreg_map(pa, IPW_PCI_BAR0, PCI_MAPREG_TYPE_MEM |
 	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, &base, &sc->sc_sz, 0);
 	if (error != 0) {
-		printf(": could not map memory space\n");
+		printf(": can't map mem space\n");
 		return;
 	}
 
@@ -191,7 +191,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
 	CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, 0);
 
 	if (pci_intr_map(pa, &ih) != 0) {
-		printf(": could not map interrupt\n");
+		printf(": can't map interrupt\n");
 		return;
 	}
 
@@ -199,7 +199,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, ipw_intr, sc,
 	    sc->sc_dev.dv_xname);
 	if (sc->sc_ih == NULL) {
-		printf(": could not establish interrupt");
+		printf(": can't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
@@ -345,7 +345,7 @@ ipw_dma_alloc(struct ipw_softc *sc)
 	error = bus_dmamem_map(sc->sc_dmat, &sc->tbd_seg, nsegs, IPW_TBD_SZ,
 	    (caddr_t *)&sc->tbd_list, BUS_DMA_NOWAIT);
 	if (error != 0) {
-		printf("%s: could not map tx ring DMA memory\n",
+		printf("%s: can't map tx ring DMA memory\n",
 		    sc->sc_dev.dv_xname);
 		goto fail;
 	}
@@ -380,7 +380,7 @@ ipw_dma_alloc(struct ipw_softc *sc)
 	error = bus_dmamem_map(sc->sc_dmat, &sc->rbd_seg, nsegs, IPW_RBD_SZ,
 	    (caddr_t *)&sc->rbd_list, BUS_DMA_NOWAIT);
 	if (error != 0) {
-		printf("%s: could not map rx ring DMA memory\n",
+		printf("%s: can't map rx ring DMA memory\n",
 		    sc->sc_dev.dv_xname);
 		goto fail;
 	}
@@ -415,7 +415,7 @@ ipw_dma_alloc(struct ipw_softc *sc)
 	error = bus_dmamem_map(sc->sc_dmat, &sc->status_seg, nsegs,
 	    IPW_STATUS_SZ, (caddr_t *)&sc->status_list, BUS_DMA_NOWAIT);
 	if (error != 0) {
-		printf("%s: could not map status ring DMA memory\n",
+		printf("%s: can't map status ring DMA memory\n",
 		    sc->sc_dev.dv_xname);
 		goto fail;
 	}
@@ -515,7 +515,7 @@ ipw_dma_alloc(struct ipw_softc *sc)
 		error = bus_dmamap_load(sc->sc_dmat, sbuf->map,
 		    mtod(sbuf->m, void *), MCLBYTES, NULL, BUS_DMA_NOWAIT);
 		if (error != 0) {
-			printf("%s: could not map rx DMA memory\n",
+			printf("%s: can't map rx DMA memory\n",
 			    sc->sc_dev.dv_xname);
 			goto fail;
 		}
@@ -1079,7 +1079,7 @@ ipw_cmd(struct ipw_softc *sc, uint32_t type, void *data, uint32_t len)
 	error = bus_dmamap_load(sc->sc_dmat, sc->cmd_map, &sc->cmd,
 	    sizeof (struct ipw_cmd), NULL, BUS_DMA_NOWAIT);
 	if (error != 0) {
-		printf("%s: could not map command DMA memory\n",
+		printf("%s: can't map command DMA memory\n",
 		    sc->sc_dev.dv_xname);
 		splx(s);
 		return error;
@@ -1185,7 +1185,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni)
 
 	error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map, m, BUS_DMA_NOWAIT);
 	if (error != 0 && error != EFBIG) {
-		printf("%s: could not map mbuf (error %d)\n",
+		printf("%s: can't map mbuf (error %d)\n",
 		    sc->sc_dev.dv_xname, error);
 		m_freem(m);
 		return error;
@@ -1213,7 +1213,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni)
 		error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map, m,
 		    BUS_DMA_NOWAIT);
 		if (error != 0) {
-			printf("%s: could not map mbuf (error %d)\n",
+			printf("%s: can't map mbuf (error %d)\n",
 			    sc->sc_dev.dv_xname, error);
 			m_freem(m);
 			return error;
@@ -1223,7 +1223,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni)
 	error = bus_dmamap_load(sc->sc_dmat, shdr->map, &shdr->hdr,
 	    sizeof (struct ipw_hdr), NULL, BUS_DMA_NOWAIT);
 	if (error != 0) {
-		printf("%s: could not map header DMA memory (error %d)\n",
+		printf("%s: can't map header DMA memory (error %d)\n",
 		    sc->sc_dev.dv_xname, error);
 		bus_dmamap_unload(sc->sc_dmat, sbuf->map);
 		m_freem(m);