Fix various printf constructs either missing arguments or format specifiers.

5 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index 398f2d4e2c4..431bfba009d 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.46 2008/08/08 01:05:20 krw Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.47 2008/10/11 20:31:50 miod Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -315,7 +315,7 @@ acpicpu_attach(struct device *parent, struct device *self, void *aux)
 #endif
 		if (sc->sc_pss_len == 0) {
 			/* this should never happen */
-			printf("%s: invalid _PSS length\n");
+			printf("%s: invalid _PSS length\n", DEVNAME(sc));
 			sc->sc_flags |= FLAGS_NOPSS;
 		}
 
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 61b857b896e..84700ca25f5 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: it.c,v 1.35 2008/10/08 17:32:47 form Exp $	*/
+/*	$OpenBSD: it.c,v 1.36 2008/10/11 20:31:50 miod Exp $	*/
 
 /*
  * Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -250,7 +250,7 @@ it_attach(struct device *parent, struct device *self, void *aux)
 
 	/* register sensor update task */
 	if (sensor_task_register(sc, it_ec_refresh, IT_EC_INTERVAL) == NULL) {
-		printf(": unable to register update task\n",
+		printf("%s: unable to register update task\n",
 		    sc->sc_dev.dv_xname);
 		bus_space_unmap(sc->sc_ec_iot, sc->sc_ec_ioh, 8);
 		return;
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 437a76033cb..1d5873174ee 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -473,7 +473,7 @@ drmopen(dev_t kdev, int flags, int fmt, struct proc *p)
 	priv->kdev = kdev;
 	priv->flags = flags;
 	priv->minor = minor(kdev);
-	DRM_DEBUG("minor = %d\n", DRM_CURRENTPID, priv->minor);
+	DRM_DEBUG("minor = %d\n", priv->minor);
 
 	/* for compatibility root is always authenticated */
 	priv->authenticated = DRM_SUSER(p);
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index a32f50555e2..0ba819967e7 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.9 2008/10/02 20:21:14 brad Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.10 2008/10/11 20:31:50 miod Exp $	*/
 
 /******************************************************************************
 
@@ -1361,7 +1361,7 @@ ixgbe_hardware_init(struct ix_softc *sc)
 	sc->hw.fc.send_xon = TRUE;
 
 	if (ixgbe_hw(&sc->hw, init_hw) != 0) {
-		printf("%s: Hardware Initialization Failed");
+		printf("%s: Hardware Initialization Failed", ifp->if_xname);
 		return (EIO);
 	}
 	bcopy(sc->hw.mac.addr, sc->arpcom.ac_enaddr,
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index eb4b42c3a20..4027aaa8549 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.120 2008/09/22 19:44:00 miod Exp $ */
+/* $OpenBSD: softraid.c,v 1.121 2008/10/11 20:31:48 miod Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -330,7 +330,7 @@ sr_meta_rw(struct sr_discipline *sd, dev_t dev, void *md, size_t sz,
 	    DEVNAME(sc), dev, md, sz, ofs, flags);
 
 	if (md == NULL) {
-		printf("%s: read invalid metadata pointer\n", sc);
+		printf("%s: read invalid metadata pointer\n", DEVNAME(sc));
 		goto done;
 	}
 
@@ -352,7 +352,7 @@ sr_meta_rw(struct sr_discipline *sd, dev_t dev, void *md, size_t sz,
 
 	if (b.b_flags & B_ERROR) {
 		printf("%s: 0x%x i/o error on block %lld while reading "
-		    "metadata %d\n", sc, dev, b.b_blkno, b.b_error);
+		    "metadata %d\n", DEVNAME(sc), dev, b.b_blkno, b.b_error);
 		goto done;
 	}
 	rv = 0;
@@ -2514,12 +2514,12 @@ sr_validate_io(struct sr_workunit *wu, daddr64_t *blk, char *func)
 
 	if (sd->sd_vol_status == BIOC_SVOFFLINE) {
 		DNPRINTF(SR_D_DIS, "%s: %s device offline\n",
-		    DEVNAME(sd->sd_sc));
+		    DEVNAME(sd->sd_sc), func);
 		goto bad;
 	}
 
 	if (xs->datalen == 0) {
-		printf("%s: %s: illegal block count\n",
+		printf("%s: %s: illegal block count for %s\n",
 		    DEVNAME(sd->sd_sc), func, sd->sd_meta->ssd_devname);
 		goto bad;
 	}
@@ -2531,8 +2531,8 @@ sr_validate_io(struct sr_workunit *wu, daddr64_t *blk, char *func)
 	else if (xs->cmdlen == 6)
 		*blk = _3btol(((struct scsi_rw *)xs->cmd)->addr);
 	else {
-		printf("%s: %s: illegal cmdlen\n", DEVNAME(sd->sd_sc), func,
-		    sd->sd_meta->ssd_devname);
+		printf("%s: %s: illegal cmdlen for %s\n",
+		    DEVNAME(sd->sd_sc), func, sd->sd_meta->ssd_devname);
 		goto bad;
 	}