diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-08-31 17:21:58 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-08-31 17:21:58 +0000 |
| commit | 2b1cf7b32d9bcf4a37c34c54ea62af227ff4730c (patch) | |
| tree | 09a365a0c3ca098f54cec23af1440e6cf91e8df0 /sys | |
| parent | 4293a14f86218aa4678d1daa11ba94570d796ec6 (diff) | |
Fix redundant device name and/or target printing after calling
sc_print_addr(); ok krw@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ncr53c9x.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/siop.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/siop_common.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/trm.c | 7 |
4 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index e8aa8b64bbb..8f29654f04f 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.37 2008/05/27 09:43:26 kettenis Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.38 2008/08/31 17:21:57 miod Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -2779,10 +2779,9 @@ ncr53c9x_timeout(arg) int s; sc_print_addr(sc_link); - printf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " + printf("timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " "<state %d, nexus %p, phase(l %x, c %x, p %x), resid %lx, " "msg(q %x,o %x) %s>", - sc->sc_dev.dv_xname, ecb, ecb->flags, ecb->dleft, ecb->stat, sc->sc_state, sc->sc_nexus, NCR_READ_REG(sc, NCR_STAT), diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 55f271bec56..887de4ffb11 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.49 2007/09/07 17:41:09 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.50 2008/08/31 17:21:57 miod Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -508,7 +508,7 @@ siop_intr(v) if (siop_cmd) sc_print_addr(xs->sc_link); else - printf("%s:", sc->sc_c.sc_dev.dv_xname); + printf("%s: ", sc->sc_c.sc_dev.dv_xname); printf("scsi gross error\n"); goto reset; } @@ -574,7 +574,7 @@ siop_intr(v) if (siop_cmd) sc_print_addr(xs->sc_link); else - printf("%s:", sc->sc_c.sc_dev.dv_xname); + printf("%s: ", sc->sc_c.sc_dev.dv_xname); printf("parity error\n"); goto reset; } diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index dfc99fc02a0..093da43d36f 100644 --- a/sys/dev/ic/siop_common.c +++ b/sys/dev/ic/siop_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_common.c,v 1.30 2007/08/05 19:05:09 kettenis Exp $ */ +/* $OpenBSD: siop_common.c,v 1.31 2008/08/31 17:21:57 miod Exp $ */ /* $NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $ */ /* @@ -805,7 +805,7 @@ siop_sdp(siop_cmd, offset) #ifdef DIAGNOSTIC if (offset > SIOP_NSG) { sc_print_addr(siop_cmd->xs->sc_link); - printf(": offset %d > %d\n", offset, SIOP_NSG); + printf("offset %d > %d\n", offset, SIOP_NSG); panic("siop_sdp: offset"); } #endif diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c index 8e1f73e1776..3e30f094609 100644 --- a/sys/dev/ic/trm.c +++ b/sys/dev/ic/trm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.c,v 1.8 2007/09/07 17:41:09 krw Exp $ +/* $OpenBSD: trm.c,v 1.9 2008/08/31 17:21:57 miod Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.c @@ -653,9 +653,8 @@ trm_timeout(void *arg1) if (xs != NULL) { sc = xs->sc_link->adapter_softc; sc_print_addr(xs->sc_link); - printf("%s: SCSI OpCode 0x%02x for target %d lun %d timed out\n", - sc->sc_device.dv_xname, xs->cmd->opcode, - xs->sc_link->target, xs->sc_link->lun); + printf("SCSI OpCode 0x%02x timed out\n", + sc->sc_device.dv_xname, xs->cmd->opcode); pSRB->SRBFlag |= TRM_SCSI_TIMED_OUT; trm_FinishSRB(sc, pSRB); trm_StartWaitingSRB(sc); |