- fix varargs after dmesg tweaking

- intrline is not a string
ok jsg@

3 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 1c81e3c1097..ff4b9cca928 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.35 2009/06/26 17:41:30 deraadt Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.36 2009/08/20 18:47:03 martynas Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -329,7 +329,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(": couldn't establish interrupt\n", DEVNAME(csc));
+		printf(": couldn't establish interrupt\n");
 		return (1);
 	}
 
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index 85baaefec39..1e107aeec17 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_cardbus.c,v 1.15 2009/08/10 21:29:37 deraadt Exp $	*/
+/*	$OpenBSD: if_re_cardbus.c,v 1.16 2009/08/20 18:47:03 martynas Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -151,7 +151,7 @@ re_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	csc->sc_ih = cardbus_intr_establish(cc, cf, csc->sc_intrline,
 	    IPL_NET, re_intr, sc, sc->sc_dev.dv_xname);
 	if (csc->sc_ih == NULL) {
-		printf(": couldn't establish interrupt at %s",
+		printf(": couldn't establish interrupt at %d",
 		    ca->ca_intrline);
 		Cardbus_function_disable(csc->ct);
 		return;
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index 5b46af4b20a..a04f131d14a 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.7 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: uhci_cardbus.c,v 1.8 2009/08/20 18:47:03 martynas Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ uhci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	/* 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(": can't map io space\n", devname);
+		printf(": can't map io space\n");
 		return;
 	}
 
@@ -123,7 +123,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(": couldn't establish interrupt\n", devname);
+		printf(": couldn't establish interrupt\n");
 		return;
 	}
 	printf(": irq %d\n", ca->ca_intrline);