Do not print adapter target id on the attachment line, now that scsibus(4)

prints it. These should be the last offenders.

7 files changed, 20 insertions, 25 deletions

diff --git a/sys/arch/hp300/dev/spc.c b/sys/arch/hp300/dev/spc.c
index 5a3c87c9ae7..c6eb44edfb8 100644
--- a/sys/arch/hp300/dev/spc.c
+++ b/sys/arch/hp300/dev/spc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spc.c,v 1.12 2005/11/14 21:51:55 miod Exp $ */
+/* $OpenBSD: spc.c,v 1.13 2008/07/30 18:08:02 miod Exp $ */
 /* $NetBSD: spc.c,v 1.2 2003/11/17 14:37:59 tsutsui Exp $ */
 
 /*
@@ -140,12 +140,12 @@ spc_dio_attach(struct device *parent, struct device *self, void *aux)
 	if ((hconf & HCONF_PARITY) == 0)
 		printf(", no parity");
 
-	id &= ID_MASK;
-	printf(", SCSI ID %d\n", id);
+	printf("\n");
 
 	if ((hconf & HCONF_PARITY) != 0)
 		sc->sc_ctlflags = SCTL_PARITY_ENAB;
 
+	id &= ID_MASK;
 	sc->sc_initiator = id;
 
 	if ((sc->sc_dev.dv_cfdata->cf_flags & SPC_NODMA) == 0) {
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 9996a6476a3..9a235810449 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.18 2007/04/22 22:31:14 deraadt Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.19 2008/07/30 18:08:03 miod Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -350,8 +350,7 @@ mesh_attach(struct device *parent, struct device *self, void *aux)
 	mesh_reset(sc);
 	mesh_bus_reset(sc);
 
-	printf(" irq %d: %dMHz, SCSI ID %d\n",
-	    sc->sc_irq, sc->sc_freq, sc->sc_id);
+	printf(" irq %d: %dMHz\n", sc->sc_irq, sc->sc_freq);
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 6e6e70aa604..2b7371b0e5d 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.24 2008/06/22 15:18:23 miod Exp $ */
+/*	$OpenBSD: vs.c,v 1.25 2008/07/30 18:08:03 miod Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -590,7 +590,7 @@ vs_initialize(sc)
 	vs_reset(sc);
 	/* sync all devices */
 	vs_resync(sc);
-	printf(": target %d\n", sc->sc_link.adapter_target);
+	printf("\n");
 }
 
 void
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index df168eae59f..3771f529d64 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.14 2006/11/28 23:59:45 dlg Exp $ */
+/*	$OpenBSD: wdsc.c,v 1.15 2008/07/30 18:08:03 miod Exp $ */
 
 /*
  * Copyright (c) 1996 Steve Woodford
@@ -115,6 +115,8 @@ wdscattach(parent, self, aux)
 	struct scsibus_attach_args saa;
 	int tmp;
 
+	printf("\n");
+
 	sc->sc_enintr  = wdsc_enintr;
 	sc->sc_dmago   = wdsc_dmago;
 	sc->sc_dmanext = wdsc_dmanext;
@@ -127,8 +129,6 @@ wdscattach(parent, self, aux)
 	sc->sc_link.device         = &wdsc_scsidev;
 	sc->sc_link.openings       = 2;
 
-	printf(": SCSI ID %d\n", sc->sc_link.adapter_target);
-
 	sc->sc_sbicp = (sbic_regmap_p)ca->ca_vaddr;
 
 	/*
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index cf5f592ee8e..05e09973fd9 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.70 2008/01/05 00:34:07 miod Exp $	*/
+/*	$OpenBSD: vs.c,v 1.71 2008/07/30 18:08:03 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -224,16 +224,16 @@ vsattach(struct device *parent, struct device *self, void *args)
 		if (bus != 0)
 			sc_link->flags = SDEV_2NDBUS;
 
-		printf("%s: channel %d, ", sc->sc_dev.dv_xname, bus);
+		printf("%s: channel %d", sc->sc_dev.dv_xname, bus);
 		switch (vc->vc_type) {
 		case VCT_SE:
-			printf("single-ended, ");
+			printf(", single-ended");
 			break;
 		case VCT_DIFFERENTIAL:
-			printf("differential, ");
+			printf(", differential");
 			break;
 		}
-		printf("SCSI ID %d\n", vc->vc_id);
+		printf("\n");
 
 		if (vc->vc_width == 0) {
 			printf("%s: daughterboard disabled, "
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index ae6ff045689..b7011f6cb20 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.23 2008/06/26 05:42:14 ray Exp $ */
+/* $OpenBSD: ncr.c,v 1.24 2008/07/30 18:08:04 miod Exp $ */
 /*	$NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $	*/
 
 /*-
@@ -173,6 +173,8 @@ si_attach(parent, self, aux)
 	struct scsibus_attach_args saa;
 	int tweak, target;
 
+	printf("\n");
+
 	/* enable interrupts on vsbus too */
 	scb_vecalloc(va->va_cvec, (void (*)(void *)) ncr5380_intr, sc,
 	    SCB_ISTACK, &sc->ncr_intrcnt);
@@ -241,8 +243,6 @@ si_attach(parent, self, aux)
 	else
 		target = (clk_page[0xbc/2] >> tweak) & 7;
 
-	printf(": SCSI ID %d\n", target);
-
 	ncr_sc->sc_link.adapter_softc =	sc;
 	ncr_sc->sc_link.adapter_target = target;
 	ncr_sc->sc_link.adapter = &si_ops;
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index d77b570094d..c863ca47c57 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt.c,v 1.15 2008/06/26 05:42:15 ray Exp $	*/
+/*	$OpenBSD: dpt.c,v 1.16 2008/07/30 18:08:04 miod Exp $	*/
 /*	$NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $	*/
 
 /*-
@@ -364,13 +364,9 @@ dpt_init(sc, intrstr)
 	if (intrstr != NULL)
 		printf("%s: interrupting at %s\n", sc->sc_dv.dv_xname, intrstr);
 
-	printf("%s: %d queued commands, %d channel(s), adapter on ID(s)", 
+	printf("%s: %d queued commands, %d channel(s)\n", 
 	    sc->sc_dv.dv_xname, sc->sc_nccbs, ec->ec_maxchannel + 1);
 
-	for (i = 0; i <= ec->ec_maxchannel; i++)
-		printf(" %d", ec->ec_hba[3 - i]);
-	printf("\n");
-
 	/* Reset the SCSI bus */
 	if (dpt_cmd(sc, NULL, 0, CP_IMMEDIATE, CPI_BUS_RESET))
 		panic("%s: dpt_cmd failed", sc->sc_dv.dv_xname);