d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove extra newlines from panic messages.

Browse Source
This commit is contained in:
Marius Strobl 2012-02-08 21:40:54 +00:00
parent a0a15716df
commit 4349d27828
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/mpt/mpt.c
View File

@ -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) {
@ -1197,8 +1197,7 @@ mpt_free_request(struct mpt_softc *mpt, request_t *req)
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;
@ -1261,7 +1260,7 @@ mpt_get_request(struct mpt_softc *mpt, int sleep_ok)
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,

12
sys/dev/mpt/mpt.h
View File

@ -851,7 +851,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);
}
}
@ -863,7 +863,7 @@ mpt_unlockspl(struct mpt_softc *mpt)
splx(mpt->mpt_splsaved);
}
} else
panic("Negative lock count\n");
panic("Negative lock count");
}
static __inline int
@ -1144,7 +1144,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]);
@ -1211,7 +1211,7 @@ mpt_req_spcl(struct mpt_softc *mpt, request_t *req, const char *s, int line)
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);
}
@ -1225,13 +1225,13 @@ mpt_req_not_spcl(struct mpt_softc *mpt, request_t *req, const char *s, int line)
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));
}

20
sys/dev/mpt/mpt_cam.c
View File

@ -1356,7 +1356,7 @@ mpt_execute_req_a64(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
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);
@ -1634,7 +1634,7 @@ mpt_execute_req_a64(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
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);
@ -1759,7 +1759,7 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
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);
@ -2029,7 +2029,7 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
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);
@ -2737,7 +2737,7 @@ mpt_scsi_reply_handler(struct mpt_softc *mpt, request_t *req,
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);
@ -3652,7 +3652,7 @@ mpt_action(struct cam_sim *sim, union ccb *ccb)
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 */
@ -4551,7 +4551,7 @@ mpt_target_start_io(struct mpt_softc *mpt, union ccb *ccb)
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) {
@ -5455,7 +5455,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_softc *mpt, request_t *req,
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;
@ -5517,7 +5517,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_softc *mpt, request_t *req,
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,
@ -5589,7 +5589,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_softc *mpt, request_t *req,
}
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;