Author: marius
Date: Tue Feb 14 01:15:01 2012
New Revision: 231629
URL: http://svn.freebsd.org/changeset/base/231629
Log:
MFC: r231228
Remove extra newlines from panic messages.
Modified:
stable/9/sys/dev/mpt/mpt.c
stable/9/sys/dev/mpt/mpt.h
stable/9/sys/dev/mpt/mpt_cam.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/mpt/mpt.c
==============================================================================
--- stable/9/sys/dev/mpt/mpt.c Tue Feb 14 01:09:10 2012 (r231628)
+++ stable/9/sys/dev/mpt/mpt.c Tue Feb 14 01:15:01 2012 (r231629)
@@ -148,7 +148,7 @@ static __inline struct mpt_personality *
mpt_pers_find(struct mpt_softc *mpt, u_int start_at)
{
KASSERT(start_at <= MPT_MAX_PERSONALITIES,
- ("mpt_pers_find: starting position out of range\n"));
+ ("mpt_pers_find: starting position out of range"));
while (start_at < MPT_MAX_PERSONALITIES
&& (mpt->mpt_pers_mask & (0x1 << start_at)) == 0) {
@@ -1203,8 +1203,7 @@ mpt_free_request(struct mpt_softc *mpt,
uint32_t offset, reply_baddr;
if (req == NULL || req != &mpt->request_pool[req->index]) {
- panic("mpt_free_request bad req ptr\n");
- return;
+ panic("mpt_free_request: bad req ptr");
}
if ((nxt = req->chain) != NULL) {
req->chain = NULL;
@@ -1267,7 +1266,7 @@ retry:
req = TAILQ_FIRST(&mpt->request_free_list);
if (req != NULL) {
KASSERT(req == &mpt->request_pool[req->index],
- ("mpt_get_request: corrupted request free list\n"));
+ ("mpt_get_request: corrupted request free list"));
KASSERT(req->state == REQ_STATE_FREE,
("req %p:%u not free on free list %x index %d function %x",
req, req->serno, req->state, req->index,
Modified: stable/9/sys/dev/mpt/mpt.h
==============================================================================
--- stable/9/sys/dev/mpt/mpt.h Tue Feb 14 01:09:10 2012 (r231628)
+++ stable/9/sys/dev/mpt/mpt.h Tue Feb 14 01:15:01 2012 (r231629)
@@ -852,7 +852,7 @@ mpt_lockspl(struct mpt_softc *mpt)
mpt->mpt_splsaved = s;
} else {
splx(s);
- panic("Recursed lock with mask: 0x%x\n", s);
+ panic("Recursed lock with mask: 0x%x", s);
}
}
@@ -864,7 +864,7 @@ mpt_unlockspl(struct mpt_softc *mpt)
splx(mpt->mpt_splsaved);
}
} else
- panic("Negative lock count\n");
+ panic("Negative lock count");
}
static __inline int
@@ -1147,7 +1147,7 @@ static __inline request_t *
mpt_tag_2_req(struct mpt_softc *mpt, uint32_t tag)
{
uint16_t rtg = (tag >> 18);
- KASSERT(rtg < mpt->tgt_cmds_allocated, ("bad tag %d\n", tag));
+ KASSERT(rtg < mpt->tgt_cmds_allocated, ("bad tag %d", tag));
KASSERT(mpt->tgt_cmd_ptrs, ("no cmd backpointer array"));
KASSERT(mpt->tgt_cmd_ptrs[rtg], ("no cmd backpointer"));
return (mpt->tgt_cmd_ptrs[rtg]);
@@ -1214,7 +1214,7 @@ mpt_req_spcl(struct mpt_softc *mpt, requ
return;
}
}
- panic("%s(%d): req %p:%u function %x not in els or tgt ptrs\n",
+ panic("%s(%d): req %p:%u function %x not in els or tgt ptrs",
s, line, req, req->serno,
((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function);
}
@@ -1228,13 +1228,13 @@ mpt_req_not_spcl(struct mpt_softc *mpt,
int i;
for (i = 0; i < mpt->els_cmds_allocated; i++) {
KASSERT(req != mpt->els_cmd_ptrs[i],
- ("%s(%d): req %p:%u func %x in els ptrs at ioindex %d\n",
+ ("%s(%d): req %p:%u func %x in els ptrs at ioindex %d",
s, line, req, req->serno,
((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function, i));
}
for (i = 0; i < mpt->tgt_cmds_allocated; i++) {
KASSERT(req != mpt->tgt_cmd_ptrs[i],
- ("%s(%d): req %p:%u func %x in tgt ptrs at ioindex %d\n",
+ ("%s(%d): req %p:%u func %x in tgt ptrs at ioindex %d",
s, line, req, req->serno,
((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function, i));
}
Modified: stable/9/sys/dev/mpt/mpt_cam.c
==============================================================================
--- stable/9/sys/dev/mpt/mpt_cam.c Tue Feb 14 01:09:10 2012
(r231628)
+++ stable/9/sys/dev/mpt/mpt_cam.c Tue Feb 14 01:15:01 2012
(r231629)
@@ -1357,7 +1357,7 @@ bad:
MPT_TGT_STATE(mpt, cmd_req)->req = NULL;
}
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
@@ -1643,7 +1643,7 @@ out:
bus_dmamap_unload(mpt->buffer_dmat, req->dmap);
}
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
@@ -1768,7 +1768,7 @@ bad:
MPT_TGT_STATE(mpt, cmd_req)->req = NULL;
}
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
@@ -2038,7 +2038,7 @@ out:
bus_dmamap_unload(mpt->buffer_dmat, req->dmap);
}
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
@@ -2746,7 +2746,7 @@ mpt_scsi_reply_handler(struct mpt_softc
mpt_prt(mpt, "mpt_scsi_reply_handler: %p:%u complete\n",
req, req->serno);
}
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
MPTLOCK_2_CAMLOCK(mpt);
xpt_done(ccb);
CAMLOCK_2_MPTLOCK(mpt);
@@ -3661,7 +3661,7 @@ mpt_action(struct cam_sim *sim, union cc
break;
}
mpt_calc_geometry(ccg, /*extended*/1);
- KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__));
+ KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
break;
}
case XPT_PATH_INQ: /* Path routing inquiry */
@@ -4560,7 +4560,7 @@ mpt_target_start_io(struct mpt_softc *mp
request_t *req;
KASSERT((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE,
- ("dxfer_len %u but direction is NONE\n", csio->dxfer_len));
+ ("dxfer_len %u but direction is NONE", csio->dxfer_len));
if ((req = mpt_get_request(mpt, FALSE)) == NULL) {
if (mpt->outofbeer == 0) {
@@ -5464,7 +5464,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so
mpt_set_ccb_status(ccb, CAM_REQ_CMP);
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
KASSERT(ccb->ccb_h.status,
- ("zero ccb sts at %d\n", __LINE__));
+ ("zero ccb sts at %d", __LINE__));
tgt->state = TGT_STATE_IN_CAM;
if (mpt->outofbeer) {
ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
@@ -5526,7 +5526,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so
mpt_set_ccb_status(ccb, CAM_REQ_CMP);
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
KASSERT(ccb->ccb_h.status,
- ("ZERO ccb sts at %d\n", __LINE__));
+ ("ZERO ccb sts at %d", __LINE__));
tgt->ccb = NULL;
} else {
mpt_lprt(mpt, MPT_PRT_DEBUG,
@@ -5598,7 +5598,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so
}
tgt = MPT_TGT_STATE(mpt, req);
KASSERT(tgt->state == TGT_STATE_LOADING,
- ("bad state 0x%x on reply to buffer post\n", tgt->state));
+ ("bad state 0x%x on reply to buffer post", tgt->state));
mpt_assign_serno(mpt, req);
tgt->state = TGT_STATE_LOADED;
break;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
