diff options
author | Matthew Wilcox <matthew@wil.cx> | 2007-09-09 10:56:37 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 14:48:07 -0400 |
commit | faac48ecf475c8e214190dabe600585e0bd4f455 (patch) | |
tree | 42a17f8cbcd860ce8d55013d160ae0257f077127 /drivers/scsi/advansys.c | |
parent | f05ec594fed6890d38bb8767676f626a4035ba55 (diff) |
[SCSI] advansys: Remove a check for an impossible condition
AscExeScsiQueue() has one caller, and it passes the address of a
variable; this cannot ever be NULL. This is the only place that ever
sets ASCQ_ERR_SCSIQ_NULL_PTR, so delete that error code too, as well as
several other unused ASCQ_ERR codes.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r-- | drivers/scsi/advansys.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index ef4f6790a251..60a918820d0d 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -520,14 +520,6 @@ typedef struct asc_risc_sg_list_q { | |||
520 | #define ASCQ_ERR_ISR_RE_ENTRY 0x1A | 520 | #define ASCQ_ERR_ISR_RE_ENTRY 0x1A |
521 | #define ASCQ_ERR_CRITICAL_RE_ENTRY 0x1B | 521 | #define ASCQ_ERR_CRITICAL_RE_ENTRY 0x1B |
522 | #define ASCQ_ERR_ISR_ON_CRITICAL 0x1C | 522 | #define ASCQ_ERR_ISR_ON_CRITICAL 0x1C |
523 | #define ASCQ_ERR_SG_LIST_ODD_ADDRESS 0x1D | ||
524 | #define ASCQ_ERR_XFER_ADDRESS_TOO_BIG 0x1E | ||
525 | #define ASCQ_ERR_SCSIQ_NULL_PTR 0x1F | ||
526 | #define ASCQ_ERR_SCSIQ_BAD_NEXT_PTR 0x20 | ||
527 | #define ASCQ_ERR_GET_NUM_OF_FREE_Q 0x21 | ||
528 | #define ASCQ_ERR_SEND_SCSI_Q 0x22 | ||
529 | #define ASCQ_ERR_HOST_REQ_RISC_HALT 0x23 | ||
530 | #define ASCQ_ERR_RESET_SDTR 0x24 | ||
531 | 523 | ||
532 | /* | 524 | /* |
533 | * Warning code values are set in ASC_DVC_VAR 'warn_code'. | 525 | * Warning code values are set in ASC_DVC_VAR 'warn_code'. |
@@ -7578,10 +7570,6 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) | |||
7578 | sg_head = scsiq->sg_head; | 7570 | sg_head = scsiq->sg_head; |
7579 | if (asc_dvc->err_code != 0) | 7571 | if (asc_dvc->err_code != 0) |
7580 | return (ERR); | 7572 | return (ERR); |
7581 | if (scsiq == (ASC_SCSI_Q *)0L) { | ||
7582 | AscSetLibErrorCode(asc_dvc, ASCQ_ERR_SCSIQ_NULL_PTR); | ||
7583 | return (ERR); | ||
7584 | } | ||
7585 | scsiq->q1.q_no = 0; | 7573 | scsiq->q1.q_no = 0; |
7586 | if ((scsiq->q2.tag_code & ASC_TAG_FLAG_EXTRA_BYTES) == 0) { | 7574 | if ((scsiq->q2.tag_code & ASC_TAG_FLAG_EXTRA_BYTES) == 0) { |
7587 | scsiq->q1.extra_bytes = 0; | 7575 | scsiq->q1.extra_bytes = 0; |