diff options
| author | emaste <emaste@FreeBSD.org> | 2011-02-04 15:45:48 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2011-02-04 15:45:48 +0000 |
| commit | 3060e03b875ee43ddb240f06123eabaa98ae70a5 (patch) | |
| tree | 18c9f5014f40d259504170fed4f3c141f3f21d56 /sys/dev/aac | |
| parent | 17c8cc38771bbfb9a6f654c051938b5c77bd5f40 (diff) | |
| download | FreeBSD-src-3060e03b875ee43ddb240f06123eabaa98ae70a5.zip FreeBSD-src-3060e03b875ee43ddb240f06123eabaa98ae70a5.tar.gz | |
We can pass a format string and args to panic(), so instead of using
printf() to output some information before a panic, just include that
information in the panic.
Submitted by: bde
Reviewed by: bde
Diffstat (limited to 'sys/dev/aac')
| -rw-r--r-- | sys/dev/aac/aacvar.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h index 14f1933..61f3c5b 100644 --- a/sys/dev/aac/aacvar.h +++ b/sys/dev/aac/aacvar.h @@ -537,9 +537,8 @@ static __inline void \ aac_enqueue_ ## name (struct aac_command *cm) \ { \ if ((cm->cm_flags & AAC_ON_AACQ_MASK) != 0) { \ - printf("command %p is on another queue, flags = %#x\n", \ - cm, cm->cm_flags); \ - panic("aac: command is on another queue"); \ + panic("aac: command %p is on another queue, flags = %#x", \ + cm, cm->cm_flags); \ } \ TAILQ_INSERT_TAIL(&cm->cm_sc->aac_ ## name, cm, cm_link); \ cm->cm_flags |= AAC_ON_ ## index; \ @@ -549,9 +548,8 @@ static __inline void \ aac_requeue_ ## name (struct aac_command *cm) \ { \ if ((cm->cm_flags & AAC_ON_AACQ_MASK) != 0) { \ - printf("command %p is on another queue, flags = %#x\n", \ - cm, cm->cm_flags); \ - panic("aac: command is on another queue"); \ + panic("aac: command %p is on another queue, flags = %#x", \ + cm, cm->cm_flags); \ } \ TAILQ_INSERT_HEAD(&cm->cm_sc->aac_ ## name, cm, cm_link); \ cm->cm_flags |= AAC_ON_ ## index; \ @@ -564,10 +562,8 @@ aac_dequeue_ ## name (struct aac_softc *sc) \ \ if ((cm = TAILQ_FIRST(&sc->aac_ ## name)) != NULL) { \ if ((cm->cm_flags & AAC_ON_ ## index) == 0) { \ - printf("command %p not in queue, flags = %#x, " \ - "bit = %#x\n", cm, cm->cm_flags, \ - AAC_ON_ ## index); \ - panic("aac: command not in queue"); \ + panic("aac: command %p not in queue, flags = %#x, bit = %#x", \ + cm, cm->cm_flags, AAC_ON_ ## index); \ } \ TAILQ_REMOVE(&sc->aac_ ## name, cm, cm_link); \ cm->cm_flags &= ~AAC_ON_ ## index; \ @@ -579,10 +575,8 @@ static __inline void \ aac_remove_ ## name (struct aac_command *cm) \ { \ if ((cm->cm_flags & AAC_ON_ ## index) == 0) { \ - printf("command %p not in queue, flags = %#x, " \ - "bit = %#x\n", cm, cm->cm_flags, \ - AAC_ON_ ## index); \ - panic("aac: command not in queue"); \ + panic("aac: command %p not in queue, flags = %#x, bit = %#x", \ + cm, cm->cm_flags, AAC_ON_ ## index); \ } \ TAILQ_REMOVE(&cm->cm_sc->aac_ ## name, cm, cm_link); \ cm->cm_flags &= ~AAC_ON_ ## index; \ |
