Following up with further dmesg display tweaking after the cardbusprint()

change.

ok deraadt@

5 files changed, 13 insertions, 40 deletions

diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index f55b55356c5..6380fb73d6f 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.30 2007/05/08 21:28:11 deraadt Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.31 2008/02/25 23:10:16 brad Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -259,7 +259,7 @@ com_cardbus_attach(struct device *parent, struct device *self, void *aux)
 
 	if (Cardbus_mapreg_map(ca->ca_ct, csc->cc_reg, csc->cc_type, 0,
 	    &sc->sc_iot, &sc->sc_ioh, &csc->cc_addr, &csc->cc_size) != 0) {
-		printf("failed to map memory");
+		printf(": failed to map memory\n");
 		return;
 	}
 
@@ -281,14 +281,8 @@ com_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	sc->disable = com_cardbus_disable;
 	sc->enabled = 0;
 
-	if (ca->ca_cis.cis1_info[0] && ca->ca_cis.cis1_info[1]) {
-		printf(": %s %s\n", ca->ca_cis.cis1_info[0],
-		    ca->ca_cis.cis1_info[1]);
-		printf("%s", DEVNAME(csc));
-	}
-
 	if (com_cardbus_enable(sc))
-		printf(": function enable failed\n");
+		return;
 	sc->enabled = 1;
 
 	sc->sc_hwflags = 0;
@@ -349,7 +343,7 @@ com_cardbus_enable(struct com_softc *sc)
 	csc->cc_ih = cardbus_intr_establish(cc, cf, psc->sc_intrline,
 	    IPL_TTY, comintr, sc, DEVNAME(csc));
 	if (csc->cc_ih == NULL) {
-		printf("%s: couldn't establish interrupt\n", DEVNAME(csc));
+		printf(": couldn't establish interrupt\n", DEVNAME(csc));
 		return (1);
 	}
 
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 52933e46f57..e0312fbc191 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_cardbus.c,v 1.9 2007/05/20 00:52:26 jsg Exp $ */
+/*	$OpenBSD: ehci_cardbus.c,v 1.10 2008/02/25 23:10:16 brad Exp $ */
 /*	$NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $	*/
 
 /*
@@ -86,7 +86,6 @@ struct cfattach ehci_cardbus_ca = {
 #define CARDBUS_INTERFACE_EHCI PCI_INTERFACE_EHCI
 #define CARDBUS_CBMEM PCI_CBMEM
 #define cardbus_findvendor pci_findvendor
-#define cardbus_devinfo pci_devinfo
 
 int
 ehci_cardbus_match(struct device *parent, void *match, void *aux)
@@ -110,18 +109,14 @@ ehci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	cardbusreg_t csr;
-	char devinfo[256];
 	usbd_status r;
 	const char *vendor;
 	const char *devname = sc->sc.sc_bus.bdev.dv_xname;
 
-	cardbus_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
-	printf(" %s", devinfo);
-
 	/* Map I/O registers */
 	if (Cardbus_mapreg_map(ct, CARDBUS_CBMEM, CARDBUS_MAPREG_TYPE_MEM, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
-		printf("%s: can't map mem space\n", devname);
+		printf(": can't map mem space\n", devname);
 		return;
 	}
 
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index b70ca56fd5f..0bf3060d7b2 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.20 2007/05/08 20:43:07 deraadt Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.21 2008/02/25 23:10:16 brad Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -162,12 +162,6 @@ fxp_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	} else
 		panic("%s: failed to allocate mem and io space", __func__);
 
-	if (ca->ca_cis.cis1_info[0] && ca->ca_cis.cis1_info[1])
-		printf(": %s %s", ca->ca_cis.cis1_info[0],
-		    ca->ca_cis.cis1_info[1]);
-	else
-		printf("\n");
-
 	sc->sc_dmat = ca->ca_dmat;
 #if 0
 	sc->sc_enable = fxp_cardbus_enable;
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 857fea72a90..cbb34c4d0c7 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_cardbus.c,v 1.9 2007/03/22 05:53:36 pascoe Exp $ */
+/*	$OpenBSD: ohci_cardbus.c,v 1.10 2008/02/25 23:10:16 brad Exp $ */
 /*	$NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $	*/
 
 /*
@@ -85,7 +85,6 @@ struct cfattach ohci_cardbus_ca = {
 #define CARDBUS_INTERFACE_OHCI PCI_INTERFACE_OHCI
 #define CARDBUS_CBMEM PCI_CBMEM
 #define cardbus_findvendor pci_findvendor
-#define cardbus_devinfo pci_devinfo
 
 int
 ohci_cardbus_match(struct device *parent, void *match, void *aux)
@@ -109,18 +108,14 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	cardbusreg_t csr;
-	char devinfo[256];
 	usbd_status r;
 	const char *vendor;
 	const char *devname = sc->sc.sc_bus.bdev.dv_xname;
 
-	cardbus_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
-	printf(" %s", devinfo);
-
 	/* Map I/O registers */
 	if (Cardbus_mapreg_map(ct, CARDBUS_CBMEM, CARDBUS_MAPREG_TYPE_MEM, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
-		printf("%s: can't map mem space\n", devname);
+		printf(": can't map mem space\n", devname);
 		return;
 	}
 
@@ -146,7 +141,7 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih = cardbus_intr_establish(cc, cf, ca->ca_intrline,
 					   IPL_USB, ohci_intr, sc, devname);
 	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt\n", devname);
+		printf(": couldn't establish interrupt\n", devname);
 		return;
 	}
 	printf(": irq %d", ca->ca_intrline);
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index 2e297d7dd48..8a9bd18da5c 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci_cardbus.c,v 1.5 2006/10/12 16:35:52 grange Exp $	*/
+/*	$OpenBSD: uhci_cardbus.c,v 1.6 2008/02/25 23:10:16 brad Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@ struct cfattach uhci_cardbus_ca = {
 
 #define CARDBUS_INTERFACE_UHCI PCI_INTERFACE_UHCI
 #define cardbus_findvendor pci_findvendor
-#define cardbus_devinfo pci_devinfo
 
 int
 uhci_cardbus_match(struct device *parent, void *match, void *aux)
@@ -99,18 +98,14 @@ uhci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	cardbusreg_t csr;
-	char devinfo[256];
 	usbd_status r;
 	const char *vendor;
 	const char *devname = sc->sc.sc_bus.bdev.dv_xname;
 
-	cardbus_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
-	printf(" %s", devinfo);
-
 	/* Map I/O registers */
 	if (Cardbus_mapreg_map(ct, PCI_CBIO, CARDBUS_MAPREG_TYPE_IO, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
-		printf("%s: can't map io space\n", devname);
+		printf(": can't map io space\n", devname);
 		return;
 	}
 
@@ -135,7 +130,7 @@ uhci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih = cardbus_intr_establish(cc, cf, ca->ca_intrline,
 					   IPL_USB, uhci_intr, sc, devname);
 	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt\n", devname);
+		printf(": couldn't establish interrupt\n", devname);
 		return;
 	}
 	printf(": irq %d\n", ca->ca_intrline);